changes to testapp2 and updating android studio
because .idea files are great
Merge branch 'master' of github.com:TackMobile/AndroidAccountManagerTest

Conflicts:
	.idea/libraries/appcompat_v7_19_1_0.xml
	gradle/wrapper/gradle-wrapper.properties
removing misc