Mod .gitignore

excluding 'backup/'
Fix Merge

- ******* ADD REVISION SORTING!!! *********
add runserver.py
Backup and Merge are now done through zip file
BugFix : merge using zipfile
backup, restore, merge with both zip and dat
Merge branch 'dev'