SL fix
Merge branch 'dev' of http://www.github.com/ziarrek/warlight into dev