Finished log in function.
Merge branch 'master' of https://github.com/WatchWeb/Project

Conflicts:
	Watch/WebRoot/WEB-INF/classes/admin/action/orderAllAction/OrderAllAction.class
Finish log in function