Merging with latest updates
Merge branch 'master' of github.com:Hansenq/nere

Conflicts:
	views/layout.jade
Updated loading animations