Update Guard
Manually annotate inline controller

It seems the ngannotate add-on isn't clever enough to catch everything.
Merge branch 'develop'