Story S-01056 and Story S-01058
Merge branch 'master' of
https://github.com/ManilaADM/medicine-inventory.git

Conflicts:
	app/views/main.scala.html