Merge branch 'master' of /home/peto/RubymineProjects/heurekafoto with conflicts.
camera model, prve spolocne funckne riesenie