Merge pull request #6 from alexcodreanu86/development

Development
final position for back button for now :-))))
getting ready to start working on paperclip
Merge branch 'master' of http://github.com/alexcodreanu86/cb_flooring_production into development