Complete Customer & Supplier
Merge branch 'master' of https://github.com/superleo-cn/fishball

Conflicts:
	app/controllers/Basic.java
	app/views/layout/default.html
commit