Stable
Merge branch 'master' of https://github.com/bojankolosnjaji/SEBA_Fitnex

Conflicts:
	SEBA_FitNex/db/h2/play.h2.db
	SEBA_FitNex/db/h2/play.trace.db
	SEBA_FitNex/eclipse/classes/BasicTest.class
	SEBA_FitNex/eclipse/classes/controllers/Application.class
	SEBA_FitNex/eclipse/classes/models/Address.class
	SEBA_FitNex/eclipse/classes/models/User.class