structure changed
Major Change
done
check
Merge branch 'master' into project_structure_change

Conflicts:
	Pachondi/libs/discussions/migrations/0001_initial.py
	Pachondi/libs/discussions/templates/discussions/group_discussion_detail.html
	Pachondi/libs/discussions/templates/discussions/group_discussion_form.html
	Pachondi/libs/discussions/templates/discussions/list.html
	Pachondi/libs/discussions/tests.py
	Pachondi/libs/discussions/urls.py
	Pachondi/libs/discussions/views.py
	Pachondi/libs/message/forms.py
	Pachondi/libs/message/templates/messages/group_disc_msg_form.html
	Pachondi/libs/message/templates/messages/group_disc_msgs_list.html
	Pachondi/libs/message/templates/messages/list.html
	Pachondi/libs/message/tests.py
	Pachondi/libs/message/views.py
	Pachondi/settings.py
	Pachondi/urls.py
	app/discussions/migrations/0001_initial.py
	app/discussions/models.py
	app/discussions/templates/discussions/group_discussion_detail.html
	app/discussions/templates/discussions/group_discussion_form.html
	app/discussions/templates/discussions/list.html
	app/discussions/tests.py
	app/discussions/urls.py
	app/discussions/views.py
	app/geography/fixtures/country.json
	app/geography/fixtures/state.json
	app/geography/models.py
	app/geography/tests.py
	app/geography/views.py
	app/groups/models.py
	app/groups/urls.py
	app/groups/views.py
	app/messages/forms.py
	app/messages/models.py
	app/messages/templates/messages/group_disc_msg_form.html
	app/messages/templates/messages/group_disc_msgs_list.html
	app/messages/templates/messages/list.html
	app/messages/views.py
	app/profile/templates/profile.html
	app/profile/templates/view_profile.html
	app/users/authentication/templates/_login.html
	app/users/fixtures/notificationtype.json
	app/users/forms.py
	app/users/models.py
	app/users/registration/templates/_register.html
	app/users/registration/templates/signup_email.html
	app/users/settings/fixtures/notificationtype.json
	app/users/templates/users/Copy of home.html
	app/users/templates/users/_login.html
	app/users/templates/users/_signup_form.html
	app/users/templates/users/home.html
	app/users/templates/users/index.html
	app/users/templates/users/logged_out.html
	app/users/templates/users/login.html
	app/users/templates/users/profile.html
	app/users/templates/users/settings.html
	app/users/templates/users/signup_email.html
	app/users/templates/users/view_profile.html
	app/users/urls.py
	app/users/utils.py
	app/users/views.py
	discussions/migrations/0001_initial.py
	discussions/templates/discussions/group_discussion_detail.html
	discussions/templates/discussions/group_discussion_form.html
	discussions/templates/discussions/list.html
	discussions/tests.py
	discussions/urls.py
	discussions/views.py
	geography/tests.py
	messages/forms.py
	messages/templates/messages/group_disc_msg_form.html
	messages/templates/messages/group_disc_msgs_list.html
	messages/templates/messages/list.html
	messages/views.py
	pachondi_development
	users/fixtures/notificationtype.json
	users/templates/users/_login.html
	users/templates/users/_signup_form.html
	users/templates/users/home.html
	users/templates/users/profile.html
	users/templates/users/signup_email.html
	users/templates/users/view_profile.html