Not working need more fixtures
Solved conflict detection occuring before form got actualized
Added logs
Found bug: need fixtures (captains connected to ships)
Added new user fixtures
Uncommented notifyConflict
Solved notifyConflict notifying wrong author of conflict
Added notifications view to home
Improved editPlanning
Merge branch 'Notifications'