(doc) adds user pathway flow chart image to doc/
(refact) renames transaction and makeTran to deal
(refact) renames makeTrans to makeLock and adds responsive styles
Merge branch 'dev' of https://github.com/CoinDrop/CoinDrop into haneous

Conflicts:
	bower.json
	public/index.html
	public/scripts/states/deal/deal.html
	public/scripts/states/deal/deal.js
	public/scripts/states/deal/deal.service.js
	public/scripts/states/makeLock/makeLock.html
	public/scripts/states/makeLock/makeLock.js
	public/scripts/states/makeLock/makeLock.service.js
	public/scripts/states/makeTran/makeTran.controller.js
	public/scripts/states/transaction/transaction.controller.js
	public/scripts/states/user/user.controller.js
	public/scripts/states/user/user.html
	public/scripts/states/user/user.service.js
	public/views/navbar.html
	specs/public/routingSpec.js
(fix) fixes today's heinous merge conflicts
(fix) fixes today's heinous merge conflicts
(fix) fixes broken button on user.html
Merge pull request #91 from loqi/newDev

New dev