Task and task dic table fixed and nickname field changed to dedault null
Merge remote-tracking branch 'upstream/master'
Added stored procedures
Added test data for user options
Made u_id in login table not null; as it doesn't make sense to have login information about a user, but not a reference /to/ that user