Create action plan (intern) + Approve action plan (lawyer)
Merge origin/master

Conflicts:
	application/views/footer.php