small fixes address edit
Merge branch 'illidar' of github.com:illidar/urbandecay into sann26
Merge branch 'sann26' of github.com:illidar/urbandecay into illidar