Merge branch 'master' of bitbucket.org:alexandru_paduraru/invoiceflow.com
Added future actions for invoice
Merge branches 'master' and 'master' of bitbucket.org:alexandru_paduraru/invoiceflow.com
Merge branches 'master', 'master' and 'ViewsChanges' of bitbucket.org:alexandru_paduraru/invoiceflow.com into ViewsChanges
Merge branch 'ViewsChanges'
Added payment modifications + merged branches
Merge branches 'master', 'master', 'ViewsChanges', 'master' and 'ViewsChanges' of bitbucket.org:alexandru_paduraru/invoiceflow.com into ViewsChanges
Merge branch 'ViewsChanges'
Added the flow for accountant for payments
Merged the changes from master
Merge branch 'master' of heroku.com:secure-woodland-7944

Conflicts:
	app/views/accountant/customer_new_invoice.erb
	app/views/salesman/_open_invoices.html.erb