removed files for merge

Signed-off-by: Jon Yardley <jonyardley@me.com>
updates to grunt file

Signed-off-by: Jon Yardley <jonyardley@me.com>
Added cancel button to scale view

Signed-off-by: Jon Yardley <jonyardley@me.com>
some more grunt fixes and a re-write of module pattern to switch to common.js

Signed-off-by: Jon Yardley <jonyardley@me.com>
Merge remote-tracking branch 'origin/development'

Signed-off-by: Jon Yardley <jonyardley@me.com>

Conflicts:
	README.md
Merge branch 'master' of https://github.com/jonyardley/AstroView
release for 0.9.3

Signed-off-by: Jon Yardley <jonyardley@me.com>