Merge pull request #52 from eddyfh/master

Merge with Aysegul and create activity saving to DB/server