merging
Merge branch 'master' of github.com:viert/wireframe

Conflicts:
	wireframe/public/javascripts/app/models.js
	wireframe/public/javascripts/ui.js