Populating base ok
Merge branch 'master' of github.com:etrange02/Mocomdo

Conflicts:
	WebContent/Menu.jsp