Conflicts:
	modules/activiti-engine/src/main/java/org/activiti/engine/impl/calendar/DurationHelper.java
	modules/activiti-engine/src/main/java/org/activiti/engine/impl/util/DefaultClockImpl.java