New changes from meeting on 01/10/14
Merge remote-tracking branch 'origin/master'

Conflicts:
	scripts/acv_func.js
	scripts/dd_func.js
	scripts/pwl_func.js
	scripts/tw_func.js