Fixed some warnings and an error (which was made possible due to dropping landscape it looks like). Also added some defensive programming to prevent a crash on the grunt table cell view. Finally, added a stub class for initiative tests.
Merge branch 'develop' into feature/Initiative

Conflicts:
	ComplexAction/ComplexAction.xcodeproj/project.pbxproj