update front end
Merge branch 'master' of https://github.com/tonysh518/carambar_03

Conflicts:
	.idea/workspace.xml
	protected/runtime/application.log