Squashed commit of the following:

commit 68e060bd76989ea1fd9e6f4df15728c9bda89801
Author: ercchy <erika@serox.si>
Date:   Thu Jul 18 15:26:32 2013 +0200

    wroking on mockup

commit 5f2f622a9a313afe59d081ba348b135a42f96cef
Author: ercchy <erika@serox.si>
Date:   Thu Jul 18 13:33:04 2013 +0200

    wroking on mockup