added gitignore
Merge branch 'master' of https://github.com/obshtestvo/gradame-meanjs
Merge branch 'master' of https://github.com/obshtestvo/gradame-meanjs
Merge branch 'master' of https://github.com/obshtestvo/gradame-meanjs
clusters fix
clusters fix 2nd try
signals: fix missing images errors
Merge pull request #1 from vns/master

Vagrant improvements
pages layout reorganized
Merge branch 'master' of https://github.com/obshtestvo/gradame-meanjs

Conflicts:
	.gitignore
	public/views/signals.html
public/img/signals/ added to .gitignore
Merge pull request #2 from mayosha/master

UI updated
removed trailing whitespace from js files; tabs converted to spaces;
reindented html files, cleaned up trailing whitespaces, removed empty lines, converted tabs to spaces
home changes
Merge branch 'dev' of https://github.com/mayosha/gradame-meanjs into mayosha-dev

Conflicts:
	public/views/home.html
Merge branch 'mayosha-dev'
added show page for signals
map zoom level reduced
Update README.md

added angularjs-token-auth reference