Revert "TESTING"

This reverts commit c8c00df7ded5ece646fcb505c54539f23fa2bb59.
Merge branch 'master' into master1
Merge branch 'master' of https://github.com/rhenz/Bonafide into master1
Test

Test
Merge branch 'master1'

Conflicts:
	Bonafide/BITViewController.h