pushed changed price model
Merge branch 'master' of github.com:jmpango/OXM
Merge branch 'master' of github.com:jmpango/OXM
Added the season and Financial Institution GUI
Merge branch 'master' of github.com:jmpango/OXM

Conflicts:
	oxm/oxm-web/src/main/webapp/WEB-INF/views/tiles/cpanel.jsp