Changed ringtone to thing
Merge branch 'master' of github.com:joninvski/showcase_server

Conflicts:
	app/controllers/Application.java
	app/models/Ringtone.java