updated file structure
updated person and friend_request model
User login/register

Able to create new users and login
Merge branch 'dev' of https://github.com/JAT-English/JAT into dev

Conflicts:
	grappelli/tinymce/examples/accessibility.html
	grappelli/tinymce/examples/css/content.css
	grappelli/tinymce/examples/css/word.css
	grappelli/tinymce/examples/custom_formats.html
	grappelli/tinymce/examples/full.html
	grappelli/tinymce/examples/index.html
	grappelli/tinymce/examples/lists/image_list.js
	grappelli/tinymce/examples/lists/link_list.js
	grappelli/tinymce/examples/lists/media_list.js
	grappelli/tinymce/examples/lists/template_list.js
	grappelli/tinymce/examples/menu.html
	grappelli/tinymce/examples/simple.html
	grappelli/tinymce/examples/skins.html
	grappelli/tinymce/examples/templates/layout1.htm
	grappelli/tinymce/examples/templates/snippet1.htm
	grappelli/tinymce/examples/word.html
	grappelli/tinymce/jscripts/tiny_mce/license.txt
	grappelli/tinymce/jscripts/tiny_mce/plugins/advhr/css/advhr.css
	grappelli/tinymce/jscripts/tiny_mce/plugins/advhr/editor_plugin_src.js
	grappelli/tinymce/jscripts/tiny_mce/plugins/advhr/js/rule.js
	grappelli/tinymce/jscripts/tiny_mce/plugins/advhr/rule.htm
	grappelli/tinymce/jscripts/tiny_mce/plugins/advimage/css/advimage.css
	grappelli/tinymce/jscripts/tiny_mce/plugins/advimage/editor_plugin_src.js
	grappelli/tinymce/jscripts/tiny_mce/plugins/advimage/image.htm
	grappelli/tinymce/jscripts/tiny_mce/plugins/advimage/js/image.js
	grappelli/tinymce/jscripts/tiny_mce/plugins/advimage_orig/css/advimage.css
	grappelli/tinymce/jscripts/tiny_mce/plugins/advimage_orig/editor_plugin_src.js
	grappelli/tinymce/jscripts/tiny_mce/plugins/advimage_orig/image.htm
	grappelli/tinymce/jscripts/tiny_mce/plugins/advimage_orig/js/image.js
	grappelli/tinymce/jscripts/tiny_mce/plugins/advlink/css/advlink.css
	grappelli/tinymce/jscripts/tiny_mce/plugins/advlink/editor_plugin_src.js
	grappelli/tinymce/jscripts/tiny_mce/plugins/advlink/js/advlink.js
	grappelli/tinymce/jscripts/tiny_mce/plugins/advlink/link.htm
	grappelli/tinymce/jscripts/tiny_mce/plugins/advlink_orig/css/advlink.css
	grappelli/tinymce/jscripts/tiny_mce/plugins/advlink_orig/editor_plugin_src.js
	grappelli/tinymce/jscripts/tiny_mce/plugins/advlink_orig/js/advlink.js
	grappelli/tinymce/jscripts/tiny_mce/plugins/advlink_orig/link.htm
	grappelli/tinymce/jscripts/tiny_mce/plugins/advlist/editor_plugin_src.js
	grappelli/tinymce/jscripts/tiny_mce/plugins/autosave/editor_plugin_src.js
	grappelli/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js
	grappelli/tinymce/jscripts/tiny_mce/plugins/contextmenu/editor_plugin_src.js
	grappelli/tinymce/jscripts/tiny_mce/plugins/directionality/editor_plugin_src.js
	grappelli/tinymce/jscripts/tiny_mce/plugins/emotions/editor_plugin_src.js
	grappelli/tinymce/jscripts/tiny_mce/plugins/emotions/emotions.htm
	grappelli/tinymce/jscripts/tiny_mce/plugins/emotions/js/emotions.js
	grappelli/tinymce/jscripts/tiny_mce/plugins/example/dialog.htm
	grappelli/tinymce/jscripts/tiny_mce/plugins/example/editor_plugin_src.js
	grappelli/tinymce/jscripts/tiny_mce/plugins/example/js/dialog.js
	grappelli/tinymce/jscripts/tiny_mce/plugins/example/langs/en.js
	grappelli/tinymce/jscripts/tiny_mce/plugins/example/langs/en_dlg.js
	grappelli/tinymce/jscripts/tiny_mce/plugins/fullpage/css/fullpage.css
	grappelli/tinymce/jscripts/tiny_mce/plugins/fullpage/editor_plugin_src.js
	grappelli/tinymce/jscripts/tiny_mce/plugins/fullpage/fullpage.htm
	grappelli/tinymce/jscripts/tiny_mce/plugins/fullpage/js/fullpage.js
	grappelli/tinymce/jscripts/tiny_mce/plugins/fullscreen/editor_plugin_src.js
	grappelli/tinymce/jscripts/tiny_mce/plugins/fullscreen/fullscreen.htm
	grappelli/tinymce/jscripts/tiny_mce/plugins/grappelli/langs/de.js
	grappelli/tinymce/jscripts/tiny_mce/plugins/grappelli/langs/en.js
	grappelli/tinymce/jscripts/tiny_mce/plugins/grappelli/langs/fr.js
	grappelli/tinymce/jscripts/tiny_mce/plugins/grappelli/langs/pl.js
	grappelli/tinymce/jscripts/tiny_mce/plugins/grappelli_contextmenu/langs/de.js
	grappelli/tinymce/jscripts/tiny_mce/plugins/grappelli_contextmenu/langs/en.js
	grappelli/tinymce/jscripts/tiny_mce/plugins/grappelli_contextmenu/langs/fr.js
	grappelli/tinymce/jscripts/tiny_mce/plugins/grappelli_contextmenu/langs/pl.js
	grappelli/tinymce/jscripts/tiny_mce/plugins/iespell/editor_plugin_src.js
	grappelli/tinymce/jscripts/tiny_mce/plugins/inlinepopups/editor_plugin_src.js
	grappelli/tinymce/jscripts/tiny_mce/plugins/inlinepopups/template.htm
	grappelli/tinymce/jscripts/tiny_mce/plugins/insertdatetime/editor_plugin_src.js
	grappelli/tinymce/jscripts/tiny_mce/plugins/layer/editor_plugin_src.js
	grappelli/tinymce/jscripts/tiny_mce/plugins/legacyoutput/editor_plugin_src.js
	grappelli/tinymce/jscripts/tiny_mce/plugins/media/css/media.css
	grappelli/tinymce/jscripts/tiny_mce/plugins/media/editor_plugin_src.js
	grappelli/tinymce/jscripts/tiny_mce/plugins/media/js/embed.js
	grappelli/tinymce/jscripts/tiny_mce/plugins/media/js/media.js
	grappelli/tinymce/jscripts/tiny_mce/plugins/media/media.htm
	grappelli/tinymce/jscripts/tiny_mce/plugins/media_orig/css/media.css
	grappelli/tinymce/jscripts/tiny_mce/plugins/media_orig/editor_plugin_src.js
	grappelli/tinymce/jscripts/tiny_mce/plugins/media_orig/js/embed.js
	grappelli/tinymce/jscripts/tiny_mce/plugins/media_orig/js/media.js
	grappelli/tinymce/jscripts/tiny_mce/plugins/media_orig/media.htm
	grappelli/tinymce/jscripts/tiny_mce/plugins/nonbreaking/editor_plugin_src.js
	grappelli/tinymce/jscripts/tiny_mce/plugins/noneditable/editor_plugin_src.js
	grappelli/tinymce/jscripts/tiny_mce/plugins/pagebreak/editor_plugin_src.js
	grappelli/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin_src.js
	grappelli/tinymce/jscripts/tiny_mce/plugins/paste/js/pastetext.js
	grappelli/tinymce/jscripts/tiny_mce/plugins/paste/js/pasteword.js
	grappelli/tinymce/jscripts/tiny_mce/plugins/paste/pastetext.htm
	grappelli/tinymce/jscripts/tiny_mce/plugins/paste/pasteword.htm
	grappelli/tinymce/jscripts/tiny_mce/plugins/paste_orig/editor_plugin_src.js
	grappelli/tinymce/jscripts/tiny_mce/plugins/paste_orig/js/pastetext.js
	grappelli/tinymce/jscripts/tiny_mce/plugins/paste_orig/js/pasteword.js
	grappelli/tinymce/jscripts/tiny_mce/plugins/paste_orig/pastetext.htm
	grappelli/tinymce/jscripts/tiny_mce/plugins/paste_orig/pasteword.htm
	grappelli/tinymce/jscripts/tiny_mce/plugins/preview/example.html
	grappelli/tinymce/jscripts/tiny_mce/plugins/preview/jscripts/embed.js
	grappelli/tinymce/jscripts/tiny_mce/plugins/preview/preview.html
	grappelli/tinymce/jscripts/tiny_mce/plugins/print/editor_plugin_src.js
	grappelli/tinymce/jscripts/tiny_mce/plugins/save/editor_plugin_src.js
	grappelli/tinymce/jscripts/tiny_mce/plugins/searchreplace/css/searchreplace.css
	grappelli/tinymce/jscripts/tiny_mce/plugins/searchreplace/editor_plugin_src.js
	grappelli/tinymce/jscripts/tiny_mce/plugins/searchreplace/js/searchreplace.js
	grappelli/tinymce/jscripts/tiny_mce/plugins/searchreplace/searchreplace.htm
	grappelli/tinymce/jscripts/tiny_mce/plugins/searchreplace_orig/css/searchreplace.css
	grappelli/tinymce/jscripts/tiny_mce/plugins/searchreplace_orig/editor_plugin_src.js
	grappelli/tinymce/jscripts/tiny_mce/plugins/searchreplace_orig/js/searchreplace.js
	grappelli/tinymce/jscripts/tiny_mce/plugins/searchreplace_orig/searchreplace.htm
	grappelli/tinymce/jscripts/tiny_mce/plugins/spellchecker/css/content.css
	grappelli/tinymce/jscripts/tiny_mce/plugins/spellchecker/editor_plugin_src.js
	grappelli/tinymce/jscripts/tiny_mce/plugins/style/css/props.css
	grappelli/tinymce/jscripts/tiny_mce/plugins/style/editor_plugin_src.js
	grappelli/tinymce/jscripts/tiny_mce/plugins/style/js/props.js
	grappelli/tinymce/jscripts/tiny_mce/plugins/table/cell.htm
	grappelli/tinymce/jscripts/tiny_mce/plugins/table/css/cell.css
	grappelli/tinymce/jscripts/tiny_mce/plugins/table/css/row.css
	grappelli/tinymce/jscripts/tiny_mce/plugins/table/css/table.css
	grappelli/tinymce/jscripts/tiny_mce/plugins/table/js/cell.js
	grappelli/tinymce/jscripts/tiny_mce/plugins/table/js/merge_cells.js
	grappelli/tinymce/jscripts/tiny_mce/plugins/table/js/row.js
	grappelli/tinymce/jscripts/tiny_mce/plugins/table/js/table.js
	grappelli/tinymce/jscripts/tiny_mce/plugins/table/merge_cells.htm
	grappelli/tinymce/jscripts/tiny_mce/plugins/table/row.htm
	grappelli/tinymce/jscripts/tiny_mce/plugins/table/table.htm
	grappelli/tinymce/jscripts/tiny_mce/plugins/template/blank.htm
	grappelli/tinymce/jscripts/tiny_mce/plugins/template/css/template.css
	grappelli/tinymce/jscripts/tiny_mce/plugins/template/editor_plugin_src.js
	grappelli/tinymce/jscripts/tiny_mce/plugins/template/js/template.js
	grappelli/tinymce/jscripts/tiny_mce/plugins/template/template.htm
	grappelli/tinymce/jscripts/tiny_mce/plugins/template_orig/blank.htm
	grappelli/tinymce/jscripts/tiny_mce/plugins/template_orig/css/template.css
	grappelli/tinymce/jscripts/tiny_mce/plugins/template_orig/editor_plugin_src.js
	grappelli/tinymce/jscripts/tiny_mce/plugins/template_orig/js/template.js
	grappelli/tinymce/jscripts/tiny_mce/plugins/template_orig/template.htm
	grappelli/tinymce/jscripts/tiny_mce/plugins/visualblocks/css/visualblocks.css
	grappelli/tinymce/jscripts/tiny_mce/plugins/visualblocks/editor_plugin_src.js
	grappelli/tinymce/jscripts/tiny_mce/plugins/visualchars/editor_plugin_src.js
	grappelli/tinymce/jscripts/tiny_mce/plugins/wordcount/editor_plugin_src.js
	grappelli/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/abbr.htm
	grappelli/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/acronym.htm
	grappelli/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/attributes.htm
	grappelli/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/cite.htm
	grappelli/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/css/attributes.css
	grappelli/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/css/popup.css
	grappelli/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/del.htm
	grappelli/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/editor_plugin_src.js
	grappelli/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/ins.htm
	grappelli/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/abbr.js
	grappelli/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/acronym.js
	grappelli/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/attributes.js
	grappelli/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/cite.js
	grappelli/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/del.js
	grappelli/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/element_common.js
	grappelli/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/ins.js
	grappelli/tinymce/jscripts/tiny_mce/themes/advanced/about.htm
	grappelli/tinymce/jscripts/tiny_mce/themes/advanced/anchor.htm
	grappelli/tinymce/jscripts/tiny_mce/themes/advanced/charmap.htm
	grappelli/tinymce/jscripts/tiny_mce/themes/advanced/color_picker.htm
	grappelli/tinymce/jscripts/tiny_mce/themes/advanced/editor_template_src.js
	grappelli/tinymce/jscripts/tiny_mce/themes/advanced/image.htm
	grappelli/tinymce/jscripts/tiny_mce/themes/advanced/js/about.js
	grappelli/tinymce/jscripts/tiny_mce/themes/advanced/js/anchor.js
	grappelli/tinymce/jscripts/tiny_mce/themes/advanced/js/charmap.js
	grappelli/tinymce/jscripts/tiny_mce/themes/advanced/js/image.js
	grappelli/tinymce/jscripts/tiny_mce/themes/advanced/js/link.js
	grappelli/tinymce/jscripts/tiny_mce/themes/advanced/js/source_editor.js
	grappelli/tinymce/jscripts/tiny_mce/themes/advanced/shortcuts.htm
	grappelli/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/content.css
	grappelli/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/dialog.css
	grappelli/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/ui.css
	grappelli/tinymce/jscripts/tiny_mce/themes/advanced/skins/highcontrast/content.css
	grappelli/tinymce/jscripts/tiny_mce/themes/advanced/skins/highcontrast/dialog.css
	grappelli/tinymce/jscripts/tiny_mce/themes/advanced/skins/highcontrast/ui.css
	grappelli/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/content.css
	grappelli/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/dialog.css
	grappelli/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/ui.css
	grappelli/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/ui_black.css
	grappelli/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/ui_silver.css
	grappelli/tinymce/jscripts/tiny_mce/themes/advanced/source_editor.htm
	grappelli/tinymce/jscripts/tiny_mce/themes/simple/editor_template_src.js
	grappelli/tinymce/jscripts/tiny_mce/themes/simple/skins/default/content.css
	grappelli/tinymce/jscripts/tiny_mce/themes/simple/skins/default/ui.css
	grappelli/tinymce/jscripts/tiny_mce/themes/simple/skins/o2k7/content.css
	grappelli/tinymce/jscripts/tiny_mce/themes/simple/skins/o2k7/ui.css
	grappelli/tinymce/jscripts/tiny_mce/tiny_mce_src.js
	grappelli/tinymce/jscripts/tiny_mce/utils/editable_selects.js
	grappelli/tinymce/jscripts/tiny_mce/utils/form_utils.js
	grappelli/tinymce/jscripts/tiny_mce/utils/mctabs.js
	grappelli/tinymce/jscripts/tiny_mce/utils/validate.js
	jatapp/__init__.pyc
	jatapp/admin.pyc
	jatapp/models.pyc
	jatapp/static/assets/css/bootstrap.css
	jatapp/static/assets/img/glyphicons-halflings-white.png
	jatapp/static/assets/img/glyphicons-halflings.png
	jatapp/static/assets/js/bootstrap.js
	jatapp/static/assets/js/bootstrap.min.js
	jatapp/templates/index.html
	jatapp/templates/profiles.html
	jatapp/views.pyc
	jatenglish/__init__.pyc
	jatenglish/settings.pyc
	jatenglish/urls.py
	jatenglish/urls.pyc
	jatenglish/wsgi.pyc
	main.db
	person/__init__.pyc
	person/models.pyc
Fix
Updated Register Form

Now includes email and first/last name
Merge branch 'dev' of https://github.com/JAT-English/JAT
updated stuff
social icons doe
moved stuff around, got profiles to pretty much work for looking up people and yourself, still need to style them
added gold member  stats
responsiveness
minor ui improvements, fixed responsive problems
Update .gitignore
Update README.md
Show all videos on profile.html
Merge branch 'dev' of https://github.com/JAT-English/JAT into dev
Update README.md
Update README.md
fixed media uploading