Merge branch 'hotfix/201406_big_fixes'
Add ga code for demographics.
Make scripts work.
Final change.
Merge branch 'hotfix/2014-06-ga_upgrade' into develop