Merge branch 'develop' into present
=BG= split presentation
=BG= add more todos to the todo list
Merge branch 'present' into develop
=BG= ignore misc specific files and folders