Status Quo 18.2.2014 16:55

Merged "master" branch with "dev" branch.