Formluated user activity scheme
Added demo for user activity
Merge branch 'develop' of https://github.com/pi-engine/pi into develop
Merge pull request #1197 from krisxoofoo/develop

Update Font-Awesome 4.2.0
Merge pull request #19 from pi-engine/develop

update 29-08-2014 bis