Merge branch 'master' into emocomus
[emocomus] Database integration (almost) working
[emocomus] Added country selector and date/time registration
[emocomus] Final touches on research screen
[emocomus] Moved template to emocomus.html to comply with tool integration
Merge branch 'emocomus'