Merged with MEAN Stack
Merge branch 'master' of https://github.com/kenzshi/Postaas

Conflicts:
	public/index.html
	public/js/config.js