add bookstore demo2222222222222222222

	new file:   app/data/books0.json
	new file:   app/data/books1.json
	new file:   app/data/books2.json
	new file:   app/data/books3.json
	new file:   app/data/books4.json
	new file:   app/images/angularjs.jpg
	new file:   app/scripts/controllers/book/list.js
	new file:   app/views/book/addBookForm.html
	new file:   app/views/book/bookDetail.html
	new file:   app/views/book/bookGrid.html
	new file:   app/views/book/bookList.html
	new file:   app/views/book/bookType.html
	new file:   app/views/book/home.html
	new file:   app/views/book/loginForm.html
	modified:   app/index.html
	modified:   app/scripts/controllers/book/list.js
	modified:   app/scripts/controllers/main.js
	modified:   app/scripts/router.js
	modified:   app/scripts/services/services.js
	modified:   app/views/book/addBookForm.html
	modified:   app/views/book/bookGrid.html
	modified:   app/views/main.html
directives demo 加入ng-grid，表格正确显示
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/scripts/controllers/book/list.js
	app/views/book/bookDetail.html
	app/views/book/bookGrid.html