Merge branch 'master' of
https://github.com/jchardis2/InfinityAppSolutions-libs.git

Conflicts:
	infinityappsolutions.lib.webterms/build.xml
	infinityappsolutions.lib.webvideo/.project
	infinityappsolutions.lib.webvideo/build.xml
	infinityappsolutions.lib.webvideo/src/com/infinityappsolutions/lib/webvideo/beans/VideoBean.java
	infinityappsolutions.lib/.project
	infinityappsolutions.lib/build.xml
	infinityappsolutions.server.lib/.project
	infinityappsolutions.server.lib/build.xml
	infinityappsolutions.server.lib/src/com/infinityappsolutions/server/lib/actions/IASRootLoginAction.java
	infinityappsolutions.server.lib/src/com/infinityappsolutions/server/lib/dao/mysql/UserDAO.java
	infinityappsolutions.server.lib/src/com/infinityappsolutions/server/lib/login/IASLoginAuthenticator.java
	infinityappsolutions.server.lib/src/com/infinityappsolutions/server/lib/views/CreateAccountView.java
	infinityappsolutions.server.lib/src/com/infinityappsolutions/server/lib/views/LoginView.java
Merge branch 'master' of
https://github.com/jchardis2/InfinityAppSolutions-libs.git