Adding maven badge
Merge branch 'feature/tests' into develop
Merge branch 'feature/tests' into develop
DayView tests
Changing null annotation library
Merge branch 'feature/tests' into develop
Updating readme file
Moving test to default android test framework
Updating travis config
Travis config fix
remove artifacts
Remove unused plugins
Changing compile sdk version
Cleanup
Reenabeling ertifacts
Cleanup
adding fog-json gem
Removing code coverage badge
Merge branch 'feature/integration' into develop

Conflicts:
	.travis.yml
	README.md
Travis config update