environment cleaned

	modified:   .gitignore
	new file:   Procfile
	modified:   content/__pycache__/models.cpython-34.pyc
	modified:   content/admin.py
	modified:   content/admin.pyc
	deleted:    content/migrations/__init__.py
	modified:   content/models.py
	modified:   content/models.pyc
	modified:   content/urls.py
	modified:   content/urls.pyc
	modified:   content/views.py
	modified:   content/views.pyc
	deleted:    db.sqlite3
	renamed:    suit/tests/templatetags/__init__.py -> gallery/__init__.py
	new file:   gallery/admin.py
	renamed:    content/migrations/0001_pages.py -> gallery/migrations/0001_initial.py
	renamed:    suit/tests/templates/__init__.py -> gallery/migrations/__init__.py
	new file:   gallery/models.py
	new file:   gallery/tests.py
	new file:   gallery/views.py
	deleted:    mptt/__init__.py
	deleted:    mptt/__init__.pyc
	deleted:    mptt/admin.py
	deleted:    mptt/admin.pyc
	deleted:    mptt/exceptions.py
	deleted:    mptt/exceptions.pyc
	deleted:    mptt/fields.py
	deleted:    mptt/fields.pyc
	deleted:    mptt/forms.py
	deleted:    mptt/forms.pyc
	deleted:    mptt/locale/de/LC_MESSAGES/django.mo
	deleted:    mptt/locale/de/LC_MESSAGES/django.po
	deleted:    mptt/locale/dk/LC_MESSAGES/django.mo
	deleted:    mptt/locale/dk/LC_MESSAGES/django.po
	deleted:    mptt/locale/es/LC_MESSAGES/django.mo
	deleted:    mptt/locale/es/LC_MESSAGES/django.po
	deleted:    mptt/locale/fr/LC_MESSAGES/django.mo
	deleted:    mptt/locale/fr/LC_MESSAGES/django.po
	deleted:    mptt/locale/mn/LC_MESSAGES/django.mo
	deleted:    mptt/locale/mn/LC_MESSAGES/django.po
	deleted:    mptt/locale/nb/LC_MESSAGES/django.mo
	deleted:    mptt/locale/nb/LC_MESSAGES/django.po
	deleted:    mptt/locale/pl/LC_MESSAGES/django.mo
	deleted:    mptt/locale/pl/LC_MESSAGES/django.po
	deleted:    mptt/locale/pt_BR/LC_MESSAGES/django.mo
	deleted:    mptt/locale/pt_BR/LC_MESSAGES/django.po
	deleted:    mptt/locale/ru/LC_MESSAGES/django.mo
	deleted:    mptt/locale/ru/LC_MESSAGES/django.po
	deleted:    mptt/managers.py
	deleted:    mptt/managers.pyc
	deleted:    mptt/models.py
	deleted:    mptt/models.pyc
	deleted:    mptt/templatetags/__init__.py
	deleted:    mptt/templatetags/__init__.pyc
	deleted:    mptt/templatetags/mptt_admin.py
	deleted:    mptt/templatetags/mptt_tags.py
	deleted:    mptt/utils.py
	modified:   my_portfolio/manager/theme.py
	modified:   my_portfolio/settings.py
	modified:   my_portfolio/settings.pyc
	modified:   my_portfolio/urls.py
	modified:   my_portfolio/urls.pyc
	modified:   pages/admin.py
	deleted:    pages/migrations/0001_initial.py
	deleted:    pages/migrations/__init__.py
	modified:   pages/models.py
	new file:   pages/templates/pages/head_navigation.html
	modified:   pages/templates/pages/menu_list.html
	modified:   pages/templatetags/menu_tags.py
	deleted:    photologue/__init__.py
	deleted:    photologue/__init__.pyc
	deleted:    photologue/admin.py
	deleted:    photologue/admin.pyc
	deleted:    photologue/locale/.svn/entries
	deleted:    photologue/locale/.svn/format
	deleted:    photologue/locale/pl/.svn/entries
	deleted:    photologue/locale/pl/.svn/format
	deleted:    photologue/locale/pl/LC_MESSAGES/.svn/entries
	deleted:    photologue/locale/pl/LC_MESSAGES/.svn/format
	deleted:    photologue/locale/pl/LC_MESSAGES/.svn/prop-base/django.mo.svn-base
	deleted:    photologue/locale/pl/LC_MESSAGES/.svn/text-base/django.mo.svn-base
	deleted:    photologue/locale/pl/LC_MESSAGES/.svn/text-base/django.po.svn-base
	deleted:    photologue/locale/pl/LC_MESSAGES/django.mo
	deleted:    photologue/locale/pl/LC_MESSAGES/django.po
	deleted:    photologue/management/__init__.py
	deleted:    photologue/management/__init__.pyc
	deleted:    photologue/management/commands/__init__.py
	deleted:    photologue/management/commands/__init__.pyc
	deleted:    photologue/management/commands/plcache.py
	deleted:    photologue/management/commands/plcreatesize.py
	deleted:    photologue/management/commands/plflush.py
	deleted:    photologue/management/commands/plinit.py
	deleted:    photologue/management/commands/plinit.pyc
	deleted:    photologue/models.py
	deleted:    photologue/models.pyc
	deleted:    photologue/photos/Home 2014-11-24 02-03-50.png
	deleted:    photologue/photos/WP3.8-ERD.png
	deleted:    photologue/photos/cache/Home 2014-11-24 02-03-50_admin_thumbnail.png
	deleted:    photologue/photos/cache/Home 2014-11-24 02-03-50_display.png
	deleted:    photologue/photos/cache/Home 2014-11-24 02-03-50_thumbnail.png
	deleted:    photologue/photos/cache/WP3.8-ERD_admin_thumbnail.png
	deleted:    photologue/photos/cache/WP3.8-ERD_display.png
	deleted:    photologue/photos/cache/WP3.8-ERD_thumbnail.png
	deleted:    photologue/res/.svn/entries
	deleted:    photologue/res/.svn/format
	deleted:    photologue/res/.svn/prop-base/sample.jpg.svn-base
	deleted:    photologue/res/.svn/prop-base/test_landscape.jpg.svn-base
	deleted:    photologue/res/.svn/prop-base/test_portrait.jpg.svn-base
	deleted:    photologue/res/.svn/prop-base/test_square.jpg.svn-base
	deleted:    photologue/res/.svn/text-base/sample.jpg.svn-base
	deleted:    photologue/res/.svn/text-base/test_landscape.jpg.svn-base
	deleted:    photologue/res/.svn/text-base/test_portrait.jpg.svn-base
	deleted:    photologue/res/.svn/text-base/test_square.jpg.svn-base
	deleted:    photologue/res/sample.jpg
	deleted:    photologue/res/test_landscape.jpg
	deleted:    photologue/res/test_portrait.jpg
	deleted:    photologue/res/test_square.jpg
	deleted:    photologue/samples/display reflection sample.jpg
	deleted:    photologue/samples/enhance thumbnail sample.jpg
	deleted:    photologue/templates/photologue/.svn/entries
	deleted:    photologue/templates/photologue/.svn/format
	deleted:    photologue/templates/photologue/.svn/text-base/gallery_archive.html.svn-base
	deleted:    photologue/templates/photologue/.svn/text-base/gallery_archive_day.html.svn-base
	deleted:    photologue/templates/photologue/.svn/text-base/gallery_archive_month.html.svn-base
	deleted:    photologue/templates/photologue/.svn/text-base/gallery_archive_year.html.svn-base
	deleted:    photologue/templates/photologue/.svn/text-base/gallery_detail.html.svn-base
	deleted:    photologue/templates/photologue/.svn/text-base/gallery_list.html.svn-base
	deleted:    photologue/templates/photologue/.svn/text-base/photo_archive.html.svn-base
	deleted:    photologue/templates/photologue/.svn/text-base/photo_archive_day.html.svn-base
	deleted:    photologue/templates/photologue/.svn/text-base/photo_archive_month.html.svn-base
	deleted:    photologue/templates/photologue/.svn/text-base/photo_archive_year.html.svn-base
	deleted:    photologue/templates/photologue/.svn/text-base/photo_detail.html.svn-base
	deleted:    photologue/templates/photologue/.svn/text-base/photo_list.html.svn-base
	deleted:    photologue/templates/photologue/.svn/text-base/root.html.svn-base
	deleted:    photologue/templates/photologue/gallery_archive.html
	deleted:    photologue/templates/photologue/gallery_archive_day.html
	deleted:    photologue/templates/photologue/gallery_archive_month.html
	deleted:    photologue/templates/photologue/gallery_archive_year.html
	deleted:    photologue/templates/photologue/gallery_detail.html
	deleted:    photologue/templates/photologue/gallery_list.html
	deleted:    photologue/templates/photologue/photo_archive.html
	deleted:    photologue/templates/photologue/photo_archive_day.html
	deleted:    photologue/templates/photologue/photo_archive_month.html
	deleted:    photologue/templates/photologue/photo_archive_year.html
	deleted:    photologue/templates/photologue/photo_detail.html
	deleted:    photologue/templates/photologue/photo_list.html
	deleted:    photologue/templates/photologue/root.html
	deleted:    photologue/templatetags/__init__.py
	deleted:    photologue/templatetags/__init__.pyc
	deleted:    photologue/templatetags/photologue_tags.py
	deleted:    photologue/tests.py
	deleted:    photologue/urls.py
	deleted:    photologue/urls.pyc
	deleted:    photologue/utils/EXIF.py
	deleted:    photologue/utils/EXIF.pyc
	deleted:    photologue/utils/__init__.py
	deleted:    photologue/utils/__init__.pyc
	deleted:    photologue/utils/reflection.py
	deleted:    photologue/utils/reflection.pyc
	deleted:    photologue/utils/watermark.py
	deleted:    photologue/utils/watermark.pyc
	new file:   requirement.txt
	deleted:    suit/__init__.py
	deleted:    suit/__init__.pyc
	deleted:    suit/admin.py
	deleted:    suit/admin.pyc
	deleted:    suit/config.py
	deleted:    suit/config.pyc
	deleted:    suit/models.py
	deleted:    suit/models.pyc
	deleted:    suit/static/admin/css/forms.css
	deleted:    suit/static/cms/css/pages.css
	deleted:    suit/static/suit/bootstrap/css/bootstrap.css
	deleted:    suit/static/suit/bootstrap/css/bootstrap.min.css
	deleted:    suit/static/suit/bootstrap/img/glyphicons-halflings-white-shadow.png
	deleted:    suit/static/suit/bootstrap/img/glyphicons-halflings-white.png
	deleted:    suit/static/suit/bootstrap/img/glyphicons-halflings.png
	deleted:    suit/static/suit/bootstrap/js/bootstrap.js
	deleted:    suit/static/suit/bootstrap/js/bootstrap.min.js
	deleted:    suit/static/suit/css/djangocms.css
	deleted:    suit/static/suit/css/filer.css
	deleted:    suit/static/suit/css/suit.css
	deleted:    suit/static/suit/img/ajax-loader.gif
	deleted:    suit/static/suit/img/bg_left_white.gif
	deleted:    suit/static/suit/img/bg_pattern.jpg
	deleted:    suit/static/suit/img/cc_active_nav.png
	deleted:    suit/static/suit/img/drag-handle.png
	deleted:    suit/static/suit/img/glyphicons-halflings-white-nav.png
	deleted:    suit/static/suit/img/glyphicons-halflings-white-shadow.png
	deleted:    suit/static/suit/js/djangocms.js
	deleted:    suit/static/suit/js/jquery-1.8.3.min.js
	deleted:    suit/static/suit/js/jquery.autosize-min.js
	deleted:    suit/static/suit/js/sortables.js
	deleted:    suit/static/suit/js/suit-form-confirm.js
	deleted:    suit/static/suit/js/suit.js
	deleted:    suit/static/suit/less/djangocms.less
	deleted:    suit/static/suit/less/djangocms/list.less
	deleted:    suit/static/suit/less/filer.less
	deleted:    suit/static/suit/less/footer.less
	deleted:    suit/static/suit/less/header.less
	deleted:    suit/static/suit/less/left-column.less
	deleted:    suit/static/suit/less/mixins.less
	deleted:    suit/static/suit/less/print.less
	deleted:    suit/static/suit/less/sticky-footer.less
	deleted:    suit/static/suit/less/suit.less
	deleted:    suit/static/suit/less/ui/actionlist.less
	deleted:    suit/static/suit/less/ui/box.less
	deleted:    suit/static/suit/less/ui/breadcrumb.less
	deleted:    suit/static/suit/less/ui/calendar.less
	deleted:    suit/static/suit/less/ui/datepicker.less
	deleted:    suit/static/suit/less/ui/form.less
	deleted:    suit/static/suit/less/ui/left-nav.less
	deleted:    suit/static/suit/less/ui/list.less
	deleted:    suit/static/suit/less/ui/login.less
	deleted:    suit/static/suit/less/ui/pagination.less
	deleted:    suit/static/suit/less/ui/table.less
	deleted:    suit/static/suit/less/ui/tabs.less
	deleted:    suit/static/suit/less/variables.less
	deleted:    suit/suit.css
	deleted:    suit/templates/403.html
	deleted:    suit/templates/404.html
	deleted:    suit/templates/500.html
	deleted:    suit/templates/admin/actions.html
	deleted:    suit/templates/admin/app_index.html
	deleted:    suit/templates/admin/auth/user/add_form.html
	deleted:    suit/templates/admin/auth/user/change_password.html
	deleted:    suit/templates/admin/base.html
	deleted:    suit/templates/admin/base_site.html
	deleted:    suit/templates/admin/change_form.html
	deleted:    suit/templates/admin/change_list.html
	deleted:    suit/templates/admin/change_list_results.html
	deleted:    suit/templates/admin/cms/page/change_form.html
	deleted:    suit/templates/admin/cms/page/change_list.html
	deleted:    suit/templates/admin/cms/page/includes/fieldset.html
	deleted:    suit/templates/admin/cms/page/plugin_change_form.html
	deleted:    suit/templates/admin/cms/page/widgets/plugin_item.html
	deleted:    suit/templates/admin/date_hierarchy.html
	deleted:    suit/templates/admin/delete_confirmation.html
	deleted:    suit/templates/admin/delete_selected_confirmation.html
	deleted:    suit/templates/admin/edit_inline/stacked.html
	deleted:    suit/templates/admin/edit_inline/tabular.html
	deleted:    suit/templates/admin/filer/actions.html
	deleted:    suit/templates/admin/filer/breadcrumbs.html
	deleted:    suit/templates/admin/filer/change_form.html
	deleted:    suit/templates/admin/filer/delete_confirmation.html
	deleted:    suit/templates/admin/filer/delete_selected_files_confirmation.html
	deleted:    suit/templates/admin/filer/folder/change_form.html
	deleted:    suit/templates/admin/filer/folder/choose_copy_destination.html
	deleted:    suit/templates/admin/filer/folder/choose_images_resize_options.html
	deleted:    suit/templates/admin/filer/folder/choose_move_destination.html
	deleted:    suit/templates/admin/filer/folder/choose_rename_format.html
	deleted:    suit/templates/admin/filer/folder/directory_listing.html
	deleted:    suit/templates/admin/filer/folder/directory_table.html
	deleted:    suit/templates/admin/filer/folder/new_folder_form.html
	deleted:    suit/templates/admin/filer/image/change_form.html
	deleted:    suit/templates/admin/filer/tools/clipboard/clipboard.html
	deleted:    suit/templates/admin/filer/tools/clipboard/clipboard_item_rows.html
	deleted:    suit/templates/admin/filer/tools/search_form.html
	deleted:    suit/templates/admin/filter.html
	deleted:    suit/templates/admin/import_export/base.html
	deleted:    suit/templates/admin/import_export/change_list_export.html
	deleted:    suit/templates/admin/import_export/change_list_import.html
	deleted:    suit/templates/admin/import_export/change_list_import_export.html
	deleted:    suit/templates/admin/import_export/export.html
	deleted:    suit/templates/admin/import_export/import.html
	deleted:    suit/templates/admin/includes/fieldset.html
	deleted:    suit/templates/admin/index.html
	deleted:    suit/templates/admin/login.html
	deleted:    suit/templates/admin/mptt_change_list_results.html
	deleted:    suit/templates/admin/object_history.html
	deleted:    suit/templates/admin/page_submit_line.html
	deleted:    suit/templates/admin/pagination.html
	deleted:    suit/templates/admin/search_form.html
	deleted:    suit/templates/admin/submit_line.html
	deleted:    suit/templates/registration/logged_out.html
	deleted:    suit/templates/registration/password_change_form.html
	deleted:    suit/templates/reversion/change_list.html
	deleted:    suit/templates/reversion/object_history.html
	deleted:    suit/templates/reversion/recover_form.html
	deleted:    suit/templates/reversion/recover_list.html
	deleted:    suit/templates/reversion/revision_form.html
	deleted:    suit/templates/suit/error_base.html
	deleted:    suit/templates/suit/form_as_fieldset.html
	deleted:    suit/templates/suit/includes/change_form_includes.html
	deleted:    suit/templates/suit/menu.html
	deleted:    suit/templatetags/__init__.py
	deleted:    suit/templatetags/__init__.pyc
	deleted:    suit/templatetags/suit_list.py
	deleted:    suit/templatetags/suit_list.pyc
	deleted:    suit/templatetags/suit_menu.py
	deleted:    suit/templatetags/suit_menu.pyc
	deleted:    suit/templatetags/suit_tags.py
	deleted:    suit/templatetags/suit_tags.pyc
	deleted:    suit/tests/__init__.py
	deleted:    suit/tests/config.py
	deleted:    suit/tests/mixins.py
	deleted:    suit/tests/models.py
	deleted:    suit/tests/settings.py
	deleted:    suit/tests/templates/form_tabs.py
	deleted:    suit/tests/templatetags/suit_list.py
	deleted:    suit/tests/templatetags/suit_menu.py
	deleted:    suit/tests/templatetags/suit_tags.py
	deleted:    suit/tests/test.py
	deleted:    suit/tests/urls/__init__.py
	deleted:    suit/tests/urls/admin_at_root.py
	deleted:    suit/tests/urls/admin_custom.py
	deleted:    suit/tests/urls/admin_i18n.py
	deleted:    suit/tests/utils.py
	deleted:    suit/tests/widgets.py
	deleted:    suit/utils.py
	deleted:    suit/utils.pyc
	deleted:    suit/watch_less.py
	deleted:    suit/widgets.py
	deleted:    suit/widgets.pyc
	renamed:    mptt/templates/admin/grappelli_mptt_change_list.html -> templates/admin/grappelli_mptt_change_list.html
	renamed:    mptt/templates/admin/grappelli_mptt_change_list_results.html -> templates/admin/grappelli_mptt_change_list_results.html
	renamed:    mptt/templates/admin/mptt_change_list.html -> templates/admin/mptt_change_list.html
	renamed:    mptt/templates/admin/mptt_change_list_results.html -> templates/admin/mptt_change_list_results.html
	new file:   templates/themes/defaults/base.html
	modified:   templates/themes/defaults/index.html
	modified:   templates/themes/defaults/single.html
	renamed:    requirement.txt -> requirements.txt
	modified:   my_portfolio/settings.py
requirement.txt added, django-mptt version fixed
	modified:   my_portfolio/settings.py
	modified:   my_portfolio/settings.py
	modified:   requirements.txt
	modified:   my_portfolio/settings.py
	modified:   my_portfolio/settings.py
	modified:   my_portfolio/settings.py
	deleted:    .gitignore
	deleted:    my_portfolio/settings.pyc
Merge branch 'master' of https://github.com/andrewidya/my_portfolio

Conflicts:
	.gitignore
	content/models.py
	content/models.pyc
	content/views.py
	content/views.pyc
	gallery/admin.py
	gallery/models.py
	my_portfolio/settings.py
	my_portfolio/settings.pyc
	my_portfolio/urls.py
	my_portfolio/urls.pyc
	templates/themes/defaults/index.html

	modified:   content/models.py
	modified:   content/views.py
	modified:   gallery/admin.py
	modified:   gallery/models.py
	modified:   my_portfolio/urls.py
	new file:   requirement.txt
	modified:   templates/themes/defaults/index.html