security login update
Merge branch 'master' of https://github.com/VictorChenLi/TagItWebServer

Conflicts:
	TagItWebServer/.metadata/.log
	TagItWebServer/.metadata/.plugins/com.aptana.core.io/connections.5

TagItWebServer/.metadata/.plugins/com.aptana.syncing.core/defaultConnect
ion.5
	TagItWebServer/.metadata/.plugins/com.aptana.syncing.core/sites.5

TagItWebServer/.metadata/.plugins/com.aptana.webserver.core/webservers.5

TagItWebServer/.metadata/.plugins/org.eclipse.core.resources/.safetable/
org.eclipse.core.resources
	TagItWebServer/.metadata/.plugins/org.eclipse.core.resources/.snap

TagItWebServer/.metadata/.plugins/org.eclipse.core.runtime/.settings/com
.aptana.theme.prefs

TagItWebServer/.metadata/.plugins/org.eclipse.core.runtime/.settings/org
.eclipse.debug.ui.prefs