changed template includings, user profile block was changed
Merge remote-tracking branch 'origin/master'