Development

Merging branches as development branch has now reached a relatively un-buggy stage and lots of improvements have been made to the application in general.