refactored Grievance to become GrievanceToken
Merge pull request #9 from lewisNotestine/bugfix_renameGrievanceType

refactored Grievance to become GrievanceToken
interim commit. in process of merging from master
Merge branch 'master' into bugfix_databaseRefactor

Conflicts:
	App/src/main/java/com/lnotes/grrr/activity/MainActivity.java
	App/src/main/java/com/lnotes/grrr/controller/GrievanceController.java
	App/src/main/java/com/lnotes/grrr/data/dao/DaoController.java
	App/src/main/java/com/lnotes/grrr/data/model/GrievanceToken.java