no message
Merge branch 'gh-pages' of https://github.com/HiveMobileInc/HivePlugin into gh-pages

Conflicts:
	css/screen.css
	sass/styles.scss