v0.2.0
Merge remote-tracking branch 'origin/master'

Conflicts:
	client/views/reports/reports.html
	smart.json
	smart.lock
added gitignore