Reverted moments.js to original state
Merge branch 'master' into alex
Merge branch 'master' into alex
Merge branch 'master' into alex
mass commit
Merge branch 'master' into alex

Conflicts:
	public/js/charts/chart2.js
Merge pull request #104 from blind-squirrel/alex

Alex