WM: uj belso design.. initial.
WM: User kitisztitva..
Merge branch 'master' of https://github.com/onlab2014/onlab2014_repo.git