added protected attributes
Finish demo app
Merge branch 'master' of github.com:shyakaster/demo_app2