Merge pull request #175 from adamarla/master

Reverted prior change
Mistakingly removed modal to add apprentices
Merge branch 'master' of https://github.com/abhinavc/web-application
Referencing non-existent link to click on account merge
Merge remote-tracking branch 'upstream/master'
Merge pull request #176 from adamarla/master

some bward compat changes
Do NOT update num_views_* count if logged in as Admin

The number should represent views by students and teachers when they
are logged in as themselves. Otherwise, the numbers lose some / all
of their meaning
Merge branch 'master' of heroku.com:drona
Minor edits to comments. Changed 'graded response' to 'attempt'
Removed redundant file
Quizzes tab within exploded course view should be processed directly ...

core/trigger needs to be rationalized at some point. Would take a brave soul
to do it.
Merge branch 'dev'
Insist on ensuring scans for all subparts before distributing ...
Merge branch 'dev'
count for subparts
Merge remote-tracking branch 'upstream/master'