gradle build added
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/ottamotta/locator/main/LocatorPagerActivity.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/ottamotta/locator/main/LocatorPagerActivity.java