Began work on preventing dupes
Merge branch 'dev' of github.com:Venture-TheSphinxTeam/Sphinx into dev
A stove is a stove no matter where you go
Merge branch 'dev' of github.com:Venture-TheSphinxTeam/Sphinx into dev

Conflicts:
	app/controllers/Application.java