lic
Merge branch 'master' of https://github.com/panbasten/BA

Conflicts:
	war/src/main/java/com/flywet/platform/bi/web/rest/BIIdentification.java