Merge branch 'master' of github.com:rigorighetti/manoc

Conflicts:
	root/src/include/macros.tt
Merge branch 'master' of github.com:ManocLabs/manoc
Hotfixes to custom javascript loading