Implement projecttype when generating config file: https://bugzilla.redhat.com/show_bug.cgi?id=895280
Merge branch 'rhbz895280' of github.com:zanata/zanata into rhbz895280

Conflicts:
	zanata-war/src/main/java/org/zanata/action/ConfigurationAction.java
	zanata-war/src/main/webapp/iteration/view.xhtml