Corrected naming and implemented code for add media and add step, which still needs minor addition.
Added manifest.o
Merge branch 'master' of https://github.com/nhvtgd/STEMPLUSPLUS

Conflicts:
	AndroidManifest.xml