Merge branch 'master' into remote-communication
rearranging some things
Added timestamp to jar, some buildfile cleanup
added branch name to jar file
Merge branch 'remote-communication'