Added county table on the default sql file
UI integration: Header, navigation, homepage content
Merge branch 'master' of https://github.com/ushahidi/uchaguzi
Clean up header
UI integration: User dropdown, Reports page
Add a missing function
Merge branch 'master' of https://github.com/ushahidi/uchaguzi
fixing conflicts
UI integration: Tools > Dashboard view
Merge branch 'master' of https://github.com/ushahidi/uchaguzi
conflict fix
UI integration: Submit a report, Gallery, Tools > Reports
Merge branch 'master' of https://github.com/ushahidi/uchaguzi
Header Nav -> links functional
UI integration: Tools > Create, Comments, Upload
UI integration: Logo
UI integration: Logo + Header improvements
Merge branch 'master' of https://github.com/ushahidi/uchaguzi
Add php 5.4 support
UI integration: Additions to the homepage (highlights, latest news, how to report)

Static placeholder markup for highlights and latest news. Needs wiring.