no message
Merge branch 'master' of https://github.com/bulini/onepagesite

Conflicts:
	assets/js/ajax.js