New demodata
Fix proxy fault. #292
Merge branch 'develop' into feature/wating_for_beta6
Merge branch 'develop' into feature/wating_for_beta6
Merge branch 'feature/wating_for_beta6' into develop