#33
Merge branch 'master' of https://github.com/andreasellervee/EMMtarkvaraprojekt

Conflicts:
	projekt/src/com/ee/matkarakendus/fragments/InfoFragment.java