Db modifications
Merge branch 'master' of https://github.com/badunacodruta/android-cycling

Conflicts:
	cycling-repository/src/main/resources/repository-context.xml