Added component StillCamera and variable running to Component
Added video and audio recording
Merge branch 'master' of github.com:robinbj86/EnergyWastingApp

Conflicts:
	AndroidManifest.xml
	src/com/github/robinbj86/energywastingapp/MainActivity.java