cleaned up
only load moment.js if needed
Merge branch 'dev' into min

Conflicts:
	etc/theme.js
	index.html