method
 Changes to be committed:
	new file:   client/blog/app/constants/Info.js
	new file:   client/blog/app/constants/Menu.js
	new file:   client/writer/app/utilities/pager.js

 Changes not staged for commit:
	deleted:    client/blog/app/constants/Info.js
	deleted:    client/blog/app/constants/Menu.js
	deleted:    client/writer/app/utilities/pager.js
Merge branch 'office'
method
Merge branch 'office'
Merge branch 'office'

Conflicts:
	client/blog/app/constants/info.js
	client/blog/app/constants/menu.js
method
Merge remote-tracking branch 'origin/master' into office