Merge pull request #1 from starverte/master

Merge changes
Update edit button to only appear if user can edit

Previously displayed button to any user logged in
Update header.php for Bootstrap 3 RC 1
Update content-beneficiary.php for Bootstrap 3 RC 1
Delete subpackage tag, replace with new package tag
Drop subpackage tag, replace with new package tag
Merge pull request #14 from mbeall/master

Various updates