Did stuff.
Merge branch 'master' of https://github.com/diutsu/ProdsmartDemo.git

Conflicts:
	app/controllers/Application.java
	app/views/Application/startProduction.html
Merge branch 'master' of https://github.com/diutsu/ProdsmartDemo.git

Conflicts:
	app/models/Product.java
	test/ApplicationTest.java