Completed megam_akka Gulp
Merge remote-tracking branch 'rt/master'

Conflicts:
	build.sbt
del S3 requires a fix