Merge with weeks updates
- Trying to work via Git and not SVN