Fixed major break in application where it would no longer send messages.
Latest Stable Version 2.5
Switching over to linux dev environment. Code currently does not work. in process of removing action bar sherlock
transitioned all code to use support libray instead of actionbarsherlock
changes needed for merge
Merge branch '2.2compat'

Conflicts:
	.idea/libraries/mockito_all_1_9_5.xml
	.idea/libraries/nineoldandroids_2_4_0.xml
	.idea/libraries/support_v4_19_0_1.xml
	.idea/modules.xml
	.idea/workspace.xml
	TextSpam/TextSpam-TextSpam.iml
	build/intermediates/model_data.bin
Merge remote-tracking branch 'origin/master'