adding many changes
Merge branch 'master' of https://github.com/jpazarzis/development