Creating template
Merge branch 'master' of github.com:tiagolo/hurraa

Conflicts:
	README.md
	pom.xml
	src/main/webapp/WEB-INF/web.xml
Specific customizations to Red Hat OpenShift cloud environment, running with WildFly8 and MySQL Server
Merge branch 'master' of https://github.com/cejug/hurraa

Conflicts:
	pom.xml
Removing the default index.html from OpenShift template
Change on FavIcon and logo url address so it can fit any context name.
Removing JBoss logo from OpenShift template
Merge branch 'master' into openshift
Resource not used deleted
Merge branch 'master' of https://github.com/cejug/hurraa
Replacement of pureCSS by Bootstrap
Basic layout with Bootstrap
Bootstrap basic navbar and sticky footer
Change on header icon
Merge pull request #51 from danielsoro/master

Resource not used deleted - Confirmed with @danielsoro
Inclusion of JQuery 2.1.0
Inclusion of JQuery 2.1.0
Merge branch 'master' of https://github.com/cejug/hurraa