testing
testing
grunt testing
testing
testing
Merge branch '1.0.1-quick-fixes' of https://github.com/joernroeder/nm-website into 1.0.1-quick-fixes

Conflicts:
	app/.git-hooks/pre-commit.js
	app/dist/debug/require.js
	app/dist/release/require.js