Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/projects/business/main.js
#	src/projects/pension/main.js