Added incremental versioning
Fix some errors on new calc (cause of changed parameters)
Merge branch 'master' of github.com:ninharp/ninbot

Conflicts:
	VERSION