POWER MERGE!
Squashed commit of the following:

commit f25aac4fc2a800fe65ca168924a2ab8fa376d286
Author: Dpio <piotrek2114@gmail.com>
Date:   Tue Nov 4 23:16:26 2014 +0100

    Add hibernate