Merge branch 'master' into improved-multi-instance-support

Conflicts:
	lightfish/src/main/java/org/lightfish/business/configuration/control/ConfigurationStore.java
Merge pull request #11 from rveldpau/improved-multi-instance-support

Improved multi instance support
Merge branch 'master' into session_token

Conflicts:
	lightfish/src/main/java/org/lightfish/business/configuration/control/ConfigurationStore.java