Fixing Bugs while integration
Merge branch 'origin/master'
Merge branch 'origin/master'

Conflicts:
	SchedulerWeb/src/test/resources/mappers/GeneralUserMapper.xml
	SchedulerWeb/src/test/resources/spring/test-db-context.xml
	SchedulerWeb/src/test/resources/test.properties