Merge branch 'feature/UMMELI-allow-user-to-filter-by-city' of github.com:praekelt/ummeli into feature/UMMELI-qualify-for-campaign
Merge branch 'feature/UMMELI-allow-user-to-filter-by-city' of github.com:praekelt/ummeli into feature/UMMELI-qualify-for-campaign
Merge branch 'feature/UMMELI-allow-user-to-filter-by-city' of github.com:praekelt/ummeli into feature/UMMELI-qualify-for-campaign
moved things around - create tomtom module
added templates for device detection
Merge branch 'feature/UMMELI-tom-tom-pilot' of github.com:praekelt/ummeli into feature/UMMELI-qualify-for-campaign
added tomtom module files
show device name in template
show detected device
Merge branch 'feature/UMMELI-tom-tom-pilot' of github.com:praekelt/ummeli into feature/UMMELI-qualify-for-campaign

Conflicts:
	ummeli/opportunities/views.py
Merge branch 'feature/UMMELI-tom-tom-pilot' of github.com:praekelt/ummeli into feature/UMMELI-qualify-for-campaign
added instructions for nokia devices
added general instructions
added instructions for samsung
added instructions for motorolla
added instructions for bbm
added instructions for Apple devices
added instructions for google nexus devices
enaled link to upload page
added more to git-ignore