Merge branch 'IDI-111'
Remove extra file
Merge branch 'development'
IDI-120: Upgrade wordpress instance to 3.6.1