trying commit
Merge branch 'master' of https://github.com/Drrodrigues/DPRep

Conflicts:
	HumanResourcesProject/WebContent/WEB-INF/jsp/navmenu/navigation.jsp
	HumanResourcesProject/WebContent/WEB-INF/jsp/profile.jsp
	HumanResourcesProject/WebContent/WEB-INF/spring/spring-security.xml
	HumanResourcesProject/WebContent/WEB-INF/tiles-defs/templates.xml
	HumanResourcesProject/WebContent/resources/js/grouptabs.js
	HumanResourcesProject/WebContent/resources/resources/css/ext-all-access-debug.css
	HumanResourcesProject/WebContent/resources/resources/css/ext-all-access.css
	HumanResourcesProject/WebContent/resources/resources/css/ext-all-debug.css
	HumanResourcesProject/WebContent/resources/resources/css/ext-all-gray-debug.css
	HumanResourcesProject/WebContent/resources/resources/css/ext-all-gray.css
	HumanResourcesProject/WebContent/resources/resources/css/ext-all-scoped-debug.css
	HumanResourcesProject/WebContent/resources/resources/css/ext-all-scoped.css
	HumanResourcesProject/WebContent/resources/resources/css/ext-all.css
	HumanResourcesProject/WebContent/resources/resources/css/ext-ie-debug.css
	HumanResourcesProject/WebContent/resources/resources/css/ext-ie-scoped-debug.css
	HumanResourcesProject/WebContent/resources/resources/css/ext-ie-scoped.css
	HumanResourcesProject/WebContent/resources/resources/css/ext-ie.css
	HumanResourcesProject/WebContent/resources/resources/css/ext-neptune-debug.css
	HumanResourcesProject/WebContent/resources/resources/css/ext-neptune.css
	HumanResourcesProject/WebContent/resources/resources/css/ext-sandbox-debug.css
	HumanResourcesProject/WebContent/resources/resources/css/ext-sandbox.css
	HumanResourcesProject/WebContent/resources/resources/css/ext-standard-debug.css
	HumanResourcesProject/WebContent/resources/resources/css/ext-standard-scoped-debug.css
	HumanResourcesProject/WebContent/resources/resources/css/ext-standard-scoped.css
	HumanResourcesProject/WebContent/resources/resources/css/ext-standard.css
	HumanResourcesProject/WebContent/resources/resources/themes/images/gray/button/s-arrow-bo.gif
	HumanResourcesProject/WebContent/resources/resources/themes/stylesheets/ext4/default/core/_core.scss
	HumanResourcesProject/WebContent/resources/resources/themes/stylesheets/ext4/default/layout/_layout.scss
	HumanResourcesProject/WebContent/resources/resources/themes/stylesheets/ext4/default/mixins/_background-gradient.scss
	HumanResourcesProject/WebContent/resources/resources/themes/stylesheets/ext4/default/mixins/_color-by-background.scss
	HumanResourcesProject/WebContent/resources/resources/themes/stylesheets/ext4/default/mixins/_frame.scss
	HumanResourcesProject/WebContent/resources/resources/themes/stylesheets/ext4/default/mixins/_theme-background-image.scss
	HumanResourcesProject/WebContent/resources/resources/themes/stylesheets/ext4/default/util/_splitter.scss
	HumanResourcesProject/WebContent/resources/resources/themes/stylesheets/ext4/default/variables/_button.scss
	HumanResourcesProject/WebContent/resources/resources/themes/stylesheets/ext4/default/variables/_core.scss
	HumanResourcesProject/WebContent/resources/resources/themes/stylesheets/ext4/default/variables/_focus.scss
	HumanResourcesProject/WebContent/resources/resources/themes/stylesheets/ext4/default/variables/_form.scss
	HumanResourcesProject/WebContent/resources/resources/themes/stylesheets/ext4/default/variables/_grid.scss
	HumanResourcesProject/WebContent/resources/resources/themes/stylesheets/ext4/default/variables/_menu.scss
	HumanResourcesProject/WebContent/resources/resources/themes/stylesheets/ext4/default/variables/_tabs.scss
	HumanResourcesProject/WebContent/resources/resources/themes/stylesheets/ext4/default/variables/_toolbar.scss
	HumanResourcesProject/WebContent/resources/resources/themes/stylesheets/ext4/default/widgets/_boundlist.scss
	HumanResourcesProject/WebContent/resources/resources/themes/stylesheets/ext4/default/widgets/_btn-group.scss
	HumanResourcesProject/WebContent/resources/resources/themes/stylesheets/ext4/default/widgets/_button.scss
	HumanResourcesProject/WebContent/resources/resources/themes/stylesheets/ext4/default/widgets/_colorpicker.scss
	HumanResourcesProject/WebContent/resources/resources/themes/stylesheets/ext4/default/widgets/_datepicker.scss
	HumanResourcesProject/WebContent/resources/resources/themes/stylesheets/ext4/default/widgets/_drawcomponent.scss
	HumanResourcesProject/WebContent/resources/resources/themes/stylesheets/ext4/default/widgets/_grid.scss
	HumanResourcesProject/WebContent/resources/resources/themes/stylesheets/ext4/default/widgets/_html.scss
	HumanResourcesProject/WebContent/resources/resources/themes/stylesheets/ext4/default/widgets/_loadmask.scss
	HumanResourcesProject/WebContent/resources/resources/themes/stylesheets/ext4/default/widgets/_menu.scss
	HumanResourcesProject/WebContent/resources/resources/themes/stylesheets/ext4/default/widgets/_panel.scss
	HumanResourcesProject/WebContent/resources/resources/themes/stylesheets/ext4/default/widgets/_progress-bar.scss
	HumanResourcesProject/WebContent/resources/resources/themes/stylesheets/ext4/default/widgets/_qtip.scss
	HumanResourcesProject/WebContent/resources/resources/themes/stylesheets/ext4/default/widgets/_slider.scss
	HumanResourcesProject/WebContent/resources/resources/themes/stylesheets/ext4/default/widgets/_tab.scss
	HumanResourcesProject/WebContent/resources/resources/themes/stylesheets/ext4/default/widgets/_tabbar.scss
	HumanResourcesProject/WebContent/resources/resources/themes/stylesheets/ext4/default/widgets/_toolbar.scss
	HumanResourcesProject/WebContent/resources/resources/themes/stylesheets/ext4/default/widgets/_tree.scss
	HumanResourcesProject/WebContent/resources/resources/themes/stylesheets/ext4/default/widgets/_viewport.scss
	HumanResourcesProject/WebContent/resources/resources/themes/stylesheets/ext4/default/widgets/_window.scss
	HumanResourcesProject/WebContent/resources/resources/themes/stylesheets/ext4/default/widgets/form/_all.scss
	HumanResourcesProject/WebContent/resources/resources/themes/stylesheets/ext4/default/widgets/form/_checkbox.scss
	HumanResourcesProject/WebContent/resources/resources/themes/stylesheets/ext4/default/widgets/form/_checkboxgroup.scss
	HumanResourcesProject/WebContent/resources/resources/themes/stylesheets/ext4/default/widgets/form/_field.scss
	HumanResourcesProject/WebContent/resources/resources/themes/stylesheets/ext4/default/widgets/form/_fieldset.scss
	HumanResourcesProject/WebContent/resources/resources/themes/stylesheets/ext4/default/widgets/form/_file.scss
	HumanResourcesProject/WebContent/resources/resources/themes/stylesheets/ext4/default/widgets/form/_htmleditor.scss
	HumanResourcesProject/WebContent/resources/resources/themes/stylesheets/ext4/default/widgets/form/_triggerfield.scss
	HumanResourcesProject/WebContent/resources/resources/themes/stylesheets/neptune/default/mixins/_frame.scss
	HumanResourcesProject/WebContent/resources/resources/themes/stylesheets/neptune/default/mixins/_theme-background-image.scss
	HumanResourcesProject/WebContent/resources/resources/themes/stylesheets/neptune/default/util/_messagebox.scss
	HumanResourcesProject/WebContent/resources/resources/themes/stylesheets/neptune/default/widgets/form/_field.scss
	HumanResourcesProject/src/main/java/com/isel/project/api/controller/DashboardController.java
	HumanResourcesProject/src/main/java/com/isel/project/api/controller/ProfileController.java
	HumanResourcesProject/src/main/java/com/isel/project/api/controller/ProjectController.java
	HumanResourcesProject/src/main/java/com/isel/project/api/controller/TaskController.java
	HumanResourcesProject/src/main/java/com/isel/project/api/utils/DateUtils.java
	HumanResourcesProject/src/main/java/com/isel/project/entities/base/AbstractDomainObject.java
	HumanResourcesProject/src/main/java/com/isel/project/entities/datamodel/DMTask.java
	HumanResourcesProject/src/main/java/com/isel/project/entities/dataobject/DOAbsence.java
	HumanResourcesProject/src/main/java/com/isel/project/entities/dataobject/DOAbsenceType.java
	HumanResourcesProject/src/main/java/com/isel/project/entities/dataobject/DOBenefit.java
	HumanResourcesProject/src/main/java/com/isel/project/entities/dataobject/DOCategory.java
	HumanResourcesProject/src/main/java/com/isel/project/entities/dataobject/DOCategoryBenefit.java
	HumanResourcesProject/src/main/java/com/isel/project/entities/dataobject/DOChildTask.java
	HumanResourcesProject/src/main/java/com/isel/project/entities/dataobject/DOFormation.java
	HumanResourcesProject/src/main/java/com/isel/project/entities/dataobject/DOFormationSkill.java
	HumanResourcesProject/src/main/java/com/isel/project/entities/dataobject/DOHoliday.java
	HumanResourcesProject/src/main/java/com/isel/project/entities/dataobject/DOPermission.java
	HumanResourcesProject/src/main/java/com/isel/project/entities/dataobject/DOProject.java
	HumanResourcesProject/src/main/java/com/isel/project/entities/dataobject/DOProjectTemplate.java
	HumanResourcesProject/src/main/java/com/isel/project/entities/dataobject/DORecordHours.java
	HumanResourcesProject/src/main/java/com/isel/project/entities/dataobject/DOResourceProfile.java
	HumanResourcesProject/src/main/java/com/isel/project/entities/dataobject/DOResourceSkillLevel.java
	HumanResourcesProject/src/main/java/com/isel/project/entities/dataobject/DOResourceTask.java
	HumanResourcesProject/src/main/java/com/isel/project/entities/dataobject/DORole.java
	HumanResourcesProject/src/main/java/com/isel/project/entities/dataobject/DORolePermission.java
	HumanResourcesProject/src/main/java/com/isel/project/entities/dataobject/DOSkill.java
	HumanResourcesProject/src/main/java/com/isel/project/entities/dataobject/DOSkillCategory.java
	HumanResourcesProject/src/main/java/com/isel/project/entities/dataobject/DOSkillLevel.java
	HumanResourcesProject/src/main/java/com/isel/project/entities/dataobject/DOStatuses.java
	HumanResourcesProject/src/main/java/com/isel/project/entities/dataobject/DOSubmissions.java
	HumanResourcesProject/src/main/java/com/isel/project/entities/dataobject/DOTask.java
	HumanResourcesProject/src/main/java/com/isel/project/entities/dataobject/DOTaskPath.java
	HumanResourcesProject/src/main/java/com/isel/project/entities/dataobject/DOTaskSkill.java
	HumanResourcesProject/src/main/java/com/isel/project/entities/dataobject/DOUserRole.java
	HumanResourcesProject/src/main/java/com/isel/project/entities/dataobject/DOUserSubscription.java
	HumanResourcesProject/src/main/java/com/isel/project/entities/dataobject/DOUsers.java
	HumanResourcesProject/src/main/java/com/isel/project/entities/dataobject/DOVacationCategory.java
	HumanResourcesProject/src/main/java/com/isel/project/entities/dataobject/DOtaskInProject.java
	HumanResourcesProject/src/main/java/com/isel/project/entities/dataobject/ExtendedDOHoliday.java
	HumanResourcesProject/src/main/java/com/isel/project/entities/dataobject/ExtendedDORecordHours.java
	HumanResourcesProject/src/main/java/com/isel/project/entities/dataobject/ExtendedDOVacation.java
	HumanResourcesProject/src/main/java/com/isel/project/entities/db/HRSSConnection.java
	HumanResourcesProject/src/main/java/com/isel/project/entities/db/HRSSConnectionPool.java
	HumanResourcesProject/src/main/java/com/isel/project/entities/db/MainClass.java
	HumanResourcesProject/src/main/java/com/isel/project/entities/db/TransactionManager.java
	HumanResourcesProject/src/main/java/com/isel/project/services/impl/AbsenceServiceImpl.java
	HumanResourcesProject/src/main/java/com/isel/project/services/impl/DashboardServiceImpl.java
	HumanResourcesProject/src/main/java/com/isel/project/services/impl/RegistrationUserServiceImpl.java
	HumanResourcesProject/src/main/resources/messages.properties
	HumanResourcesProject/src/scripts/createTables.sql
	HumanResourcesProject/src/test/java/com/isel/project/impl/CategoryUnitTest.java
	HumanResourcesProject/src/test/java/com/isel/project/impl/FormationUnitTest.java
	HumanResourcesProject/src/test/java/com/isel/project/impl/SkillUnitTest.java
	HumanResourcesProject/src/test/java/com/isel/project/impl/SubmissionUnitTest.java
	HumanResourcesProject/src/test/java/com/isel/project/impl/TaskPathUnitTest.java