Merge branch 'master' of github.com:ouyoutouchmytralala/bandyard

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Merge branch 'master' of github.com:ouyoutouchmytralala/bandyard

Conflicts:
	app/assets/javascripts/store.js
	app/assets/javascripts/templates/application.handlebars
	app/assets/javascripts/views/application_view.js
Add TODO. Welcome to additions.