Finishes features page
Fixes conflict
Merge branch 'slave'
Changed user profile view.
Finishes analytics
Merge branch 'slave'
Merge branch 'slave'
Merge branch 'slave'
Merge branch 'slave'
Merge branch 'slave'
Merge branch 'slave'
Merge branch 'slave'
Merge branch 'slave'
Merge branch 'slave'
Merge branch 'slave'
Merge branch 'slave'
Adds Home in index page
Merge branch 'slave' of github.com:akosipc/iZone-Hackathon into slave