Bumped version number
Merge branch 'nightly'
Merge branch 'master' of https://github.com/greebowarrior/nessa