.gitignore and Dashboard.js updated
Merge branch 'master'

Conflicts:
	.gitignore
	app/assets/javascripts/dashboards.js
	tmp/cache/assets/development/sprockets/19d565a9adf9c444137823f34a04c01a
	tmp/cache/assets/development/sprockets/25a6d1febd322002921ae5b3b31f307d
	tmp/cache/assets/development/sprockets/2f5173deea6c795b8fdde723bb4b63af
	tmp/cache/assets/development/sprockets/671b089b50e0197b801775c133af338d
	tmp/cache/assets/development/sprockets/cffd775d018f68ce5dba1ee0d951a994
	tmp/cache/assets/development/sprockets/f7cbd26ba1d28d48de824f0e94586655