rob change
Merge branch 'master' of https://github.com/naman34/optimus_device

* 'master' of https://github.com/naman34/optimus_device:
  added icons

Conflicts:
	platforms/ios/cordova/console.log
icons
Merge branch 'master' of https://github.com/naman34/optimus_device

* 'master' of https://github.com/naman34/optimus_device:
  added audioManager for uploading