Rename stuffs, ad getter/setter for level  and increment levels values
Merge branch 'develop'