added test button
Merge branch 'master' of https://github.com/CollabCombat/CollabCombat-iOS