Merge branch 'hotfix/fork_cron' into develop
Merge branch 'master' into develop
execute showif and value only for rendered items
also fixes a bug where "null" results for showif weren't cached
Merge branch 'hotfix/reduce_unnecessary_opencpu_calls' into develop
typo fix parse error
don't show password when DB connection fails (oh my)
fix item function, wider text inputs
Merge branch 'hotfix/reduce_unnecessary_opencpu_calls'
Merge branch 'hotfix/reduce_unnecessary_opencpu_calls' into develop
Merge branch 'master' into develop
list widget (without reordering)
fix dummy run object
fix opencpu cache
fix paths for rcharts
Merge branch 'develop' into feature/run_settings

Conflicts:
	Model/OpenCPU.php