[midPoint-git] [Evolveum/midpoint] 37161e: Merge branch 'master' into feature/menu

[Viliam Repan]

  Branch: refs/heads/feature/menu
  Home:   https://github.com/Evolveum/midpoint
  Commit: 37161e15846a164ccc92e242a0d129cc20588a05
      https://github.com/Evolveum/midpoint/commit/37161e15846a164ccc92e242a0d129cc20588a05
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2015-09-28 (Mon, 28 Sep 2015)

  Changed paths:
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties

  Log Message:
  -----------
  Merge branch 'master' into feature/menu

Conflicts:
	gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/DropDownFormGroup.java
	gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/TextAreaFormGroup.java
	gui/admin-gui/src/main/resources/localization/Midpoint.properties