build 201406061926
Merge branch 'master' into build

Conflicts:
	templates/project/source/index.html.slim
	templates/project/source/sass/_variable.sass
	templates/project/source/sass/partials/_global.sass
merge fix