Merge branch 'orm_implementation' of...

Merge branch 'orm_implementation' of gitlab.fi.muni.cz:xsotolar/irtis-data-collector into orm_implementation

# Conflicts:
#	app/src/main/java/cz/muni/irtis/datacollector/synchronization/SyncManager.java