error handle
Merge branch 'master' of github.com:nikezono/unific

Conflicts:
	public/js/main.js