peggy dev
Merge branch 'dev_Peggy' of github.com:DataAnalyticsinStudentHands/RESTFUL-WS
Continue working on App example  for master
Removed Group related stuff from master, added SimpleObject
Merge branch 'master' of
https://github.com/DataAnalyticsinStudentHands/RESTFUL-WS.git into
PlantApp2

Conflicts:
	src/main/java/dash/DashApplicationSetup.java
	src/main/java/dash/dao/GroupEntity.java
	src/main/java/dash/pojo/Group.java
	src/main/resources/spring/applicationContext.xml

Fixed the conflicts