Merge branch 'master' of https://github.com/guozhgang/iframe

Conflicts:
	WebContent/app/admin-org.jsp
	WebContent/logs/log.log
	app/com/skss/app/entity/Organization.java
	app/com/skss/app/entity/User.java
	app/com/skss/app/web/OrgAction.java
Merge branch 'master' of https://github.com/guozhgang/iframe
Merge branch 'master' of https://github.com/guozhgang/iframe

Conflicts:
	WebContent/logs/log.log