first steps to ember-cli
Merge branch 'master' into feat/ember-cli
migration to ember-cli
support ember server --proxy feature

Move api.php in api/ folder; using .htaccess to map every request to api/index.php
requires apache mod-rewrite module and permissions
ember-validations as ember-addons
fix namespace reference to own application
api proxy is not defined in package.json in ember-cli
use node-phpcgi instead of proxy to serve api

php-cgi has to be installed and path have to be correct in server/index.js; default is debian standard
Merge branch 'master' into feat/ember-cli

Conflicts:
	app/index.html
rewritten option and input field relationship

keep inputs while setting up poll and update options based on inputs by observer
Merge branch 'feat/backbutton-on-create' into feat/ember-cli

Conflicts:
	app/controllers/create/options-datetime.js
	app/controllers/create/options.js
	app/views/create/options-datetime.js
back button: load old selection into calendar
Merge branch 'master' of github.com:jelhan/croodle