Sync#1

Merged

matteing merged 11 commits intoci-3.0_bringupfrom

May 10, 2015

Commits on May 10, 2015

Fixed feed and JS
Sergio
committed
Merge branch 'develop' of https://github.com/Mxious/Mxious into develop
Sergio
committed
Added ignored files
root
committed