Updated to latest an
Migrated to angular 1.3
Merge branch 'master' into gh-pages

Conflicts:
	bundle.js