fix #24
Merge branch 'master' of https://github.com/freewind/rythmfiddle

Conflicts:
	app/controllers/Application.java