Merge pull request #19 from nguyenquangdung/Trainee_profile

Trainee-Supervisor-profile
New modeling

Conflicts:
	db/schema.rb
Merge pull request #22 from ilovearsenal93/newmodeling

New modeling
Add-edit-delete trainee
In the middle