commit
Merge branch 'master' of github.com:wweliz/tandem

Conflicts:
	app/scripts/main.js
Merge branch 'master' of github.com:wweliz/tandem
hey
Merge branch 'master' of github.com:wweliz/tandem
starts on set language page
Merge pull request #1 from plove13x/ploveTrials

Adds basic Who I want to Meet form elements
added message view
Merge branch 'master' of github.com:wweliz/tandem
Merge branch 'master' of github.com:wweliz/tandem
Merge pull request #2 from olliegill/master

start on set language page
Move to Parse
Merge pull request #3 from jacobthemyth/master

Move to Parse
added parse javascript sdk to bower.json
Fixes bower.json conflict
Introduces minor tweaks to Who I want to Meet
Merge remote-tracking branch 'upstream/master' into ploveTrials