Added .idea to gitignore
Removed android-studio file from repo
Android-studio changes made according to guster's instructions
Removed android-studio files
Removed repeated string
Upgrades for gradle
Merge branch 'contacts-integration' into gradling

Conflicts:
	AndroidManifest.xml
	res/layout/contactrow.xml
	res/values/strings.xml
Merge branch 'tmp' into gradling
Gradle and xml files okay. Now to get libraries
Removed android studio files
Remove out directory
Removed android-support jar
Can compile with gradle
Ignore .gradle folders and added libraries
Merge remote-tracking branch 'origin/contacts-integration' into r1

Conflicts:
	res/layout/contactrow.xml
	res/values/strings.xml
local.properties.dist file
Merge branch 'contacts-integration' of www.g-i.com.my:tan-chong/sa into contacts-integration
Merge branch 'contacts-integration' into r1
Ignore build folder
transaction started