Corrected wrong implementations of instancetype.
correction to last commit.
Merge branch 'develop' into feature/rewards_stuff_continued
Merge branch 'develop' into feature/rewards_stuff_continued
Merge branch 'develop' into feature/rewards_stuff_continued
more or less done with rewards & reward details.
Merge branch 'develop' into feature/rewards_stuff_continued

Conflicts:
	gbk/GBK.xcodeproj/project.pbxproj
Merge branch 'feature/rewards_stuff_continued' into develop