Delete duplicate lines
Created a BitMap Controller to convert pictures, upload and retrieve them from a webserver. Not yet implemented / or funcional. Committed only to be able to merge on master.
Merge branch 'master' into zztimybranch

Conflicts:
	AndroidManifest.xml