minhnguyen - add user profile
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/Safety/SafetyStuffs/WicketApplication_en.properties
	src/main/java/Safety/SafetyStuffs/WicketApplication_vi.properties