Merge origin/master

Conflicts:
	AteaAOS/AteaAOS-web/src/main/webapp/WEB-INF/faces-config.xml
	AteaAOS/AteaAOS-web/src/main/webapp/adminSecure/admin.xhtml
	AteaAOS/AteaAOS-web/src/main/webapp/secure/template/footer.xhtml
Merge origin/master
Merge origin/master
Merge origin/master

Conflicts:
	AteaAOS/AteaAOS-web/src/main/webapp/WEB-INF/faces-config.xml
	AteaAOS/AteaAOS-web/src/main/webapp/adminSecure/admin.xhtml
	AteaAOS/AteaAOS-web/src/main/webapp/secure/template/footer.xhtml
Merge origin/master

Conflicts:
	AteaAOS/AteaAOS-web/src/main/webapp/WEB-INF/faces-config.xml
	AteaAOS/AteaAOS-web/src/main/webapp/adminSecure/admin.xhtml
	AteaAOS/AteaAOS-web/src/main/webapp/secure/template/footer.xhtml
Merge origin/master

Conflicts:
	AteaAOS/AteaAOS-web/src/main/webapp/WEB-INF/faces-config.xml
	AteaAOS/AteaAOS-web/src/main/webapp/adminSecure/admin.xhtml
	AteaAOS/AteaAOS-web/src/main/webapp/secure/template/footer.xhtml
Merge origin/master

Conflicts:
	AteaAOS/AteaAOS-web/src/main/webapp/WEB-INF/faces-config.xml
	AteaAOS/AteaAOS-web/src/main/webapp/adminSecure/admin.xhtml
	AteaAOS/AteaAOS-web/src/main/webapp/secure/template/footer.xhtml
Merge origin/master

Conflicts:
	AteaAOS/AteaAOS-web/src/main/webapp/WEB-INF/faces-config.xml
	AteaAOS/AteaAOS-web/src/main/webapp/adminSecure/admin.xhtml
	AteaAOS/AteaAOS-web/src/main/webapp/secure/template/footer.xhtml
Merge origin/master

Conflicts:
	AteaAOS/AteaAOS-web/src/main/webapp/WEB-INF/faces-config.xml
	AteaAOS/AteaAOS-web/src/main/webapp/adminSecure/admin.xhtml
	AteaAOS/AteaAOS-web/src/main/webapp/secure/template/footer.xhtml
Merge origin/master

Conflicts:
	AteaAOS/AteaAOS-web/src/main/webapp/WEB-INF/faces-config.xml
	AteaAOS/AteaAOS-web/src/main/webapp/adminSecure/admin.xhtml
	AteaAOS/AteaAOS-web/src/main/webapp/secure/template/footer.xhtml
Merge origin/master