adjustment to config.xml and iphone css
adjustments to css to login
fixed conflict between local and remote

Conflicts:
	www/main.html