branch master 1.7 - update to 1.04
Merge branch 'master' of github.com:ophian/serendipity_event_dashboard