__options bugfix
Add missing JS Files
Merge remote-tracking branch 'origin/develop' into gh-pages

Conflicts:
	examples/todomvc/bower.json