Updated project files for using latest build tools
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/libraries/floatingactionbutton_1_0_9.xml
	.idea/libraries/support_v13_21_0_0.xml
	.idea/libraries/support_v4_21_0_0.xml
	SMSFinder.iml
Updated project files for using latest build tools 2