update build tool
Removed failing test
Merge pull request #2 from clarityhk/integration_pavel

Tests are passing
add style guide
Merge branch 'testing' into integration_merge

Conflicts:
	app/build.gradle
	app/src/main/java/com/clarityhk/goodcity/activities/IntroductionActivity.java
	app/src/main/res/layout/activity_introduction.xml
	app/src/main/res/values/colors.xml
	app/src/test/java/com/clarityhk/goodcity/test/DummyTest.java
Merge pull request #3 from clarityhk/integration_merge

Integration merge
Removed old test case
Merge pull request #4 from clarityhk/integration_merge

Removed old test case
Created tests for style guide