MAPPAR!!!!!!!
Merge branch 'new-dev' of
https://github.com/genomizer/genomizer-android.git into new-dev

Conflicts:
	Genomizer-Android/src/se/umu/cs/pvt151/ConverterFragment.java