Sync
Merge branch 'master' of https://github.com/jiver/finex

Conflicts:
	public/app.js

sync