Added user plain
Merge origin/develop into develop

Conflicts:
	CloudStar/CloudStar-ejb/src/java/com/cloudstar/user/AccountPlain.java
	CloudStar/CloudStar-ejb/src/java/com/cloudstar/user/UserPlain.java