testing nicks
added joined, left messages
Moving few files around
Merge branch 'develop' of git://github.com/orlof/megastage into gradle_eclipse