commit bla1
Merge branch 'beta' of https://github.com/vnmedia/onimusic into beta

Conflicts:
	public/js/controllers.js
	public/partials/signup.html