Merge branch 'dev' into tcuje
renamed LocalisationActivity to MainActivity, bugfix interfaces
ops droped MainActivity
Merge branch 'dev' into tcuje
update todo and fixme
removed unused code, improved scan result handling
Merge branch 'tcuje' into dev
Merge remote-tracking branch 'origin/dev' into michael