Added Categories
Merge remote-tracking branch 'origin/master'

Conflicts:
	IFITS/src/main/java/com/oe/test/controllers/LoginController.java
	IFITS/src/main/java/com/oe/test/controllers/NewsController.java
	IFITS/src/main/webapp/WEB-INF/spring-security.xml
	IFITS/src/main/webapp/WEB-INF/tiles.xml
	IFITS/src/main/webapp/WEB-INF/views/index.jsp
	IFITS/src/main/webapp/WEB-INF/web.xml