Update 2014.01.18
Some ignore configs
some changes
Merge branch 'master' of https://github.com/PorkyPork83/StudyBuddy

Conflicts:
	src/eu/dtc/studybuddy/db/helper/DbOpenHelper.java
Merge branch 'master' of https://github.com/PorkyPork83/StudyBuddy