Small style changes
Merge branch 'master' into Front-End
Changes before upload to dev site
Merge branch 'Front-End'
Bug fixes after wordpress crash
Merge branch 'master' into backend-init
New db
Merge branch 'Front-End'
Merge branch 'master' into backend-init
some logic issues resolved

In info and collaboration-info
Merge branch 'master' into backend-init