bug fix number one$
Merge branch 'master' of github.com:miro86/testinggit into r2_contact
continue changing on this branch