rebase-20140926: Fix errors from conflicts resolution
rebase-20140926: Fix errors from conflicts resolution

edx-solutions/edx-platform,edx-solutions/edx-platform,edx-solutions/edx-platform,edx-solutions/edx-platform