media implementation
Merge branch 'master' of https://github.com/sowmya-sama/the-elements

Conflicts:
	TheElements-dev/.cproject
	TheElements-dev/jni/Android.mk
	TheElements-dev/src/com/idkjava/thelements/SplashActivity.java