Merge branch 'master' of https://github.com/AndroidGears/Plugin

Conflicts:
	AndroidGears/.idea/workspace.xml
- workspace fixes
- workspace fixes
Merge branch 'master' of https://github.com/AndroidGears/Plugin

Conflicts:
	AndroidGears/.idea/workspace.xml