Start reworking the flow module
Rework the flow framework to match the Java Flow framework more closely
Merge branch 'master' of github.com:aam229/aws-flow-client

Conflicts:
	java/config/application.yml
	java/src/META-INF/aop.xml
	java/src/awsflowclienttest/Server.java
	java/src/awsflowclienttest/workflows/ActivitySimpleImpl.java
	src/server/Activity.js
	src/server/Server.js
	tests/activities/Simple.js
	tests/assets/bk/client_server.js