Initial commit.
Merge origin/master

Conflicts:
	config.ini
	nbactions.xml
	pom.xml
	src/main/java/models_new/storage/HibernateUtil.java