Convert to Annotation driven framework
Merge branch 'XMLFree' of github.com:tonyfyt/bookshelf into XMLFree