Initial commit
Merge http://github.com/radeoliv/blr-project