faq account features pages changed according to new psd design and glyphicons are added to analytics page
merge data from origin master
publish div is uncommented
conflicts in main.js are resolved
commit with conflict in analytic and main.ja
conflicts in master's analytics.html and main.js are resolved