Commit before merge
Commit before merge
Merge remote-tracking branch 'origin/son' into hoang
Merge remote-tracking branch 'origin/son' into hoang
Add Task mockup
Update managing Project functions
Merged with hoang
Update Project Controller
A version which can be merged to master
Formatted code
UserBundle with AngularJS
UserBundle with AngularJS