database import
Database import module
Database Import
Merge branch 'master' of
https://github.com/davigrangeiro/expressMatch.git

Conflicts:
	expressMatch/database/expressMatch_er.mwb
	expressMatch/database/expressMatch_er.mwb.bak
	expressMatch/database/sql/database.sql
	expressMatch/src/main/java/br/usp/ime/escience/expressmatch/controller/DrawablePanel.java
	expressMatch/src/main/java/br/usp/ime/escience/expressmatch/model/Point.java
	expressMatch/src/main/webapp/WEB-INF/applicationContext-security.xml
	expressMatch/src/main/webapp/WEB-INF/applicationContext.xml
	expressMatch/src/main/webapp/pages/login/login.xhtml