- More changes.
- Merge branch 'master' of https://github.com/lawwton/ourdemo

Conflicts:
	src/main/java/com/netapp/ourdemo/entities/ExportPolicyEntity.java
	src/main/java/com/netapp/ourdemo/entities/IGroupEntity.java
	src/main/java/com/netapp/ourdemo/entities/PortsetEntity.java
	src/main/java/com/netapp/ourdemo/entities/StorageProtocolEntity.java