Merge branch 'master' of https://github.com/radiantbluetechnologies/omar

Conflicts:
	apps/omar/omar-2.0.tmproj
	plugins/omar-core/omar-core.tmproj
	plugins/omar-video/omar-video.tmproj
Removed tgz