Update makefile
Update canossa
Add some rule-based commands (move windows)
Rebuild
Merge branch 'develop'