fixed 1340 length of textfield limit
fix bug issue 1342 - cancelButton
fix defect-1308: Deleted User reappears after logging out and logging in back again.
fix defect: 1306 - Defect: No verify prompt if he/she is sure to add the new user
fix 1304: defect DateOfBirth can be set later than the present date. solution: disable present onward date.
fix 1304: defect DateOfBirth can be set later than the present date. solution: disable present onward date.
Merge remote-tracking branch 'carter/bug-fix-1342' into develop

* carter/bug-fix-1342:
  fix bug issue 1342 - cancelButton
Merge remote-tracking branch 'alex/develop' into develop

* alex/develop:
  fix 1304: defect DateOfBirth can be set later than the present date. solution: disable present onward date.
  fix 1304: defect DateOfBirth can be set later than the present date. solution: disable present onward date.
  fix defect: 1306 - Defect: No verify prompt if he/she is sure to add the new user
  fix defect-1308: Deleted User reappears after logging out and logging in back again.

Conflicts:
	app/scripts/views/employees.js
Merge remote-tracking branch 'elizar/develop' into develop

* elizar/develop:
  re-implemented fix for task 1337