Make 2.x form use location widget for location form
Fix label on email field in post form
Merge branch 'master' of git://github.com/ushahidi/Lamu