pad fix
Merge branch 'gh-pages' of github.com:mapbox/maki into gh-pages
adding maki icons
adjusted large size icon
updating lighthouse
Merge pull request #116 from mapbox/lighthouseicon

adding lighthouse icon
Add camera icon
Merge pull request #118 from sozialhelden/photo_icon

Add camera icon
Capitalize "cross" to be consistent with the rest of the names

Capitalize "cross" to "Cross" in order to be consistent with the rest of
the names
Update ArcGIS styles to latest version (camera icons etc)

Update ArcGIS styles to latest version. Now includes vector, retina, and
representation versions
Update documentation to reflect latest ArcGIS styles

Update documentation to reflect latest ArcGIS styles and the utility
used to create them
Merge pull request #119 from williamscraigm/gh-pages

Update ArcGIS styles and documentation
Merge branch 'gh-pages' into dog-park

Conflicts:
	_includes/maki.json
	www/images/maki-sprite.dark.png
	www/images/maki-sprite.dark@2x.png
	www/images/maki-sprite.png
	www/images/maki-sprite@2x.png
	www/maki-sprite.css