Handle nil or "" as the proposal_id
Merge pull request #118 from cdearborn/pull-req-master-63dfe3a3c387afc82552207b7258fc5a376b93bc

Merged by devtool for aabes
fix unless to be while
Merge pull request #119 from cloudedge/pull-req-master-a5cef33661485f12205db574632537726a51de3b

Barclamp View fix (Trello 73) [2/2]