Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Adding select2 back into project so that South doesn't throw up all over us.