Building, but still WIP for refactor of entities.
Merge branch 'feature/Initiative' of https://github.com/isnotnil/complex_action_ios into feature/Initiative
Clean up from getting latest. Holy crap.
Merge branch 'develop' of https://github.com/isnotnil/complex_action_ios into feature/Initiative

Conflicts:
	ComplexAction/ComplexAction.xcodeproj/project.pbxproj
More cleanup. Almost ready to start updating the DB.
Converting initiative type to enum (base type int) to make database persistance a bit cleaner.
Database is not rebuilding correctly. Not too sure why as it looks correct. Will review in the morning.
Repaired database stuff. Now on to new dev!
Merge branch 'develop' of https://github.com/isnotnil/complex_action_ios into feature/Initiative
Fixing a few more data issues (stability problems).
Corrected a few issues with the grunt table view. Added a toString() func for initiativeType.
More refactoring and getting started on encounters.
fixed issue with unit test build.  more inits for the win.
GM Mode settings option.
stubbed in encounter button