removed duplicate properties
Merge branch 'master' of github.com:varzin/web-template