Major changes
Update db
Merge branch 'master' of https://github.com/CaM2091/ActiFeel