2 commits

Author	SHA1	Message	Date
Christian Schabesberger	7cc1c0fbdd	merge code, and adjust code	2016-02-05 17:09:29 +01:00
chschtsch	db500e9791	fix layout issues & update screenshots	2015-12-15 13:45:59 +03:00