2nd scenario changes
Merge branch 'master' of https://github.com/fp7-alien/Alien-Demo-FIA2014

Conflicts:
	demo1/demo_website/index.html