due to wrong gitignore
Merge branch 'master' of ssh://github.com/s0uli/enjoy-sql

Conflicts:
	SimpleSQLProject/.idea/workspace.xml
fixed wrong method signature in xmlLoader/data/Table.java