edits
Merge branch 'master' of github.com:Brovoker/JSF-Courses