2014.8.24. loading seatplan from DB...
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/iceru/teacherschores/SeatFragment.java