Refreshed schema with the right DB code
Updated with some steps
Merge branch 'phase_two' of https://github.com/beldog/dashboard into
phase_two

Conflicts:
	src/main/resources/scheme.sql