This commit is fired from VisualStudio 2012
Let's trigger a merge conflict!
Commit
Next step to merge conflict
Merge branch 'develop' into master