# This is a combination of 2 commits.
# The first commit's message is:

trying to get language picker to work (totally WIP)

# This is the 2nd commit message:

Add client-side RequireJS (WIP, quilt and language picker are not working)
Fix merge conflict