Merge pull request #97 from jpolvora/master

Router doesn't set caption for auto mapped routes
Updated some files in skeletons.
Merge remote-tracking branch 'upstream/master'