Merge origin/master

Conflicts:
	src/java/SessionBeans/PostFacade.java
Merge origin/master
Merge origin/master

Conflicts:
	src/java/SessionBeans/PostFacade.java
Merge origin/master

Conflicts:
	web/falsomapa.jsp
Merge origin/master

Conflicts:
	web/admin.jsp
	web/admin_ok.jsp
	web/index.html
Merge origin/master

Conflicts:
	web/admin.jsp
	web/admin_ok.jsp
	web/index.html
Merge origin/master