changed config branch to point to master
Merge branch 'release/22052013'
Merge commit '22052013' into develop