commit
no message
Merge branch 'master' of https://github.com/AFd3z/wusickapp

Conflicts:
	wusick/.project
	wusick/lib/controllers/api.js