gitIgnore
mergeboh
Merge branch 'master' of
https://github.com/smartcampuslab/smartcampus.bikesharing.git

Conflicts:
	BikeRovereto/src/smartcampus/activity/MainActivity.java
aaa
Merge branch 'master' of
https://github.com/smartcampuslab/smartcampus.bikesharing.git

Conflicts:
	BikeRovereto/src/smartcampus/activity/MainActivity.java