Now reporting object selection
Merge branch 'master' into gh-pages

Conflicts:
	bower.json