Merge branch 'master' of github.com:mozilla-services/FindMyDevice into dev
Merge branch 'dev' of github.com:mozilla-services/FindMyDevice into dev
correct date to be timestamp
Merge pull request #262 from jrconlin/dev

Fix create_db.sql to match current state
Removed background for mobile breakpoints.

Should fix issue with flickering on FxOS devices.
Disabled csslint in the css grunt task.
Increased sleep time on travis before testing.
Merge pull request #273 from mozilla-services/issue-272-fxos-flickering

Removed background for mobile breakpoint
resolving main.css
Merge pull request #267 from pdehaan/scsslint

tweaking the Sass per scss-lint rules
Fix to correct out of standard logging flag

* How the heck did I miss that one?
Merge pull request #274 from jrconlin/dev

Fix to correct out of standard logging flag
Remove dev debugging statements
Merge pull request #275 from jrconlin/dev

Remove dev debugging statements
updating node modules

Conflicts:
	static/package.json
updating deps and adding shrinkwrap
Changing to validate-shrinkwrap in Travis
remove npm spinner and validate-package from default grunt task
Merge pull request #266 from pdehaan/issue-264-redux

updating node modules
Merge branch 'dev' into l10n