ygs2014-11-11 10:36:24注册登录设计
ygs2014-11-11 10:37:09增加注册登录页面和后台
Merge branch 'master' of https://github.com/Y-ghost/YUN2.git

Conflicts:
	src/main/java/com/rest/yun/service/Impl/EquipmentServiceImpl.java