fcAction
Merge branch 'master' of https://github.com/icaruus/il12a.git

Conflicts:
	IL12A_Budget/WebContent/WEB-INF/pages/login.jsp
Merge branch 'master' of https://github.com/icaruus/il12a.git