Merge branch 'emocomus'
[master] Added code aiming at APACHE compatibility
Merge branch 'emocomus'
[master] Adapted directory structure to comply with server requirements
Merge branch 'master' into emocomus
[emocomus] Database integration (almost) working
[emocomus] Added country selector and date/time registration
[emocomus] Final touches on research screen