Merge branch 'release/projects-homepage' into develop
Merge branch 'hotfix/updates' into develop
Add Grunt build script
Merge branch 'hotfix/gruntjs' into develop

Conflicts:
	Gruntfile.js
	package.json
Merge branch 'hotfix/updates' into develop
Merge branch 'hotfix/updates' into develop
Merge branch 'hotfix/minor' into develop
Merge branch 'hotfix/minor' into develop
Merge branch 'hotfix/homepage' into develop
Merge branch 'hotfix/updates' into develop
Merge branch 'hotfix/updates' into develop
Merge branch 'hotfix/bugfixes' into develop
Merge branch 'hotfix/updates' into develop
Merge branch 'hotfix/fout' into develop
Fix conflict
Finessing this beast
Optimize images
Merge branch 'release/7.0.0'