pre-release fixes
Merge remote-tracking branch 'origin/develop' into develop
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	interview/pom.xml
Merge pull request #91 from combats/preRelease

Pre release