local
Merge branch 'master' of https://github.com/bhand-mm/distributed-genetic-algorithm-framework

Conflicts:
	src/main/scala/com/mediamath/genetical/Main.scala
	src/main/scala/com/mediamath/genetical/StrategyActor.scala
	src/main/scala/com/mediamath/genetical/ui/UIService.scala