issue 25
merged with master
more change to confix.xml
more confix.xml changes
more confix.xml changes2
more confix.xml changes3
fix for back and next button
iphone css
iphone css2
iphone css3
fixed answer propagation on datetime interval form
issue 13
iphone css and local login adjustments
merge remote with local
adjustments to css to login
fixed conflict between local and remote

Conflicts:
	www/main.html