GCP-8194 - added else
Merge commit '616e26e990f8696e44eae1b49db2dbd4e13417b7' into branch_release_20140410
Merge branch 'master' into branch_release_20140410
GCP-8373
GCP-8372, GCP-8026
GCP-8388
GCP-8388
Merge branch 'branch_release_20140410' of https://github.com/digitalabs/ETLSample

Conflicts:
	src/main/webapp/WEB-INF/i18n/Messages.properties
	src/main/webapp/WEB-INF/pages/angular/angularSelectSheet.html