Update datebase design
Merge branch 'master' of git@github.com:CoachLab2013/MMS.git

Conflicts:
	Team1_Db/TestApp/src/database/IncidentDb.java
Update employee table