Merge branch 'development' of D:\study\git\labs-questionnaire-template with conflicts.
LQE-64 - Add template controller + some refactoring + some changes that are needed to work with primefaces 3.5