Article attachment filter now displays the correct number of attachments by doctype
	modified:   src/main/webapp/js/directives.js
	modified:   src/main/webapp/lib/pyklresource/index.html
	modified:   src/main/webapp/lib/pyklresource/resource.js
Article attachments will get a ref property based on the parent article id
	modified:   src/main/webapp/js/directives.js
	modified:   src/main/webapp/lib/pykladmin/adminCtrl.js
Changed the heading of the article filter from 'Attachments' to 'All Attachments'
	modified:   src/main/webapp/lib/pyklresource/index.html
Moved mimetype logic for attachments from resource.js to adminCtrl.js
	modified:   src/main/webapp/lib/pykladmin/adminCtrl.js
	modified:   src/main/webapp/lib/pyklresource/resource.js
Clicking the article filter checkbox will filter articles by the doctype of their attachments
	modified:   src/main/webapp/WEB-INF/api/main.js
	modified:   src/main/webapp/lib/pykladmin/adminCtrl.js
	modified:   src/main/webapp/lib/pyklresource/index.html
	modified:   src/main/webapp/lib/pyklresource/resource.js
Attachment toggle filter is working
	modified:   src/main/webapp/lib/pykladmin/adminCtrl.js
	modified:   src/main/webapp/lib/pyklresource/index.html
	modified:   src/main/webapp/lib/pyklresource/resource.js
Users can filter articles by the doctype of an article attachment
	modified:   src/main/webapp/lib/pyklresource/index.html
	modified:   src/main/webapp/lib/pyklresource/resource.js
Search filtering for articles works properly
	modified:   src/main/webapp/lib/pyklresource/resource.js
The article filter does not take into account a search term when filtering articles, it currently only uses doctypes
	modified:   src/main/webapp/css/app.css
	modified:   src/main/webapp/lib/pyklresource/index.html
	modified:   src/main/webapp/lib/pyklresource/resource.js
The browse file dialog is now working when a user attempts to update their profile image
	modified:   src/main/webapp/js/directives.js
	modified:   src/main/webapp/lib/profile/partials/view.html
File browse dialogs now appear in ie8 and ie9 for embedding images in articles through tinymce
Merge branch 'article-attachment-filter' into develop

* article-attachment-filter:
  File browse dialogs now appear in ie8 and ie9 for embedding images in articles through tinymce
  The browse file dialog is now working when a user attempts to update their profile image 	modified:   src/main/webapp/js/directives.js 	modified:   src/main/webapp/lib/profile/partials/view.html
  The article filter does not take into account a search term when filtering articles, it currently only uses doctypes 	modified:   src/main/webapp/css/app.css 	modified:   src/main/webapp/lib/pyklresource/index.html 	modified:   src/main/webapp/lib/pyklresource/resource.js
  Search filtering for articles works properly 	modified:   src/main/webapp/lib/pyklresource/resource.js
  Users can filter articles by the doctype of an article attachment 	modified:   src/main/webapp/lib/pyklresource/index.html 	modified:   src/main/webapp/lib/pyklresource/resource.js
  Attachment toggle filter is working 	modified:   src/main/webapp/lib/pykladmin/adminCtrl.js 	modified:   src/main/webapp/lib/pyklresource/index.html 	modified:   src/main/webapp/lib/pyklresource/resource.js
  Clicking the article filter checkbox will filter articles by the doctype of their attachments 	modified:   src/main/webapp/WEB-INF/api/main.js 	modified:   src/main/webapp/lib/pykladmin/adminCtrl.js 	modified:   src/main/webapp/lib/pyklresource/index.html 	modified:   src/main/webapp/lib/pyklresource/resource.js
  Moved mimetype logic for attachments from resource.js to adminCtrl.js 	modified:   src/main/webapp/lib/pykladmin/adminCtrl.js 	modified:   src/main/webapp/lib/pyklresource/resource.js
  Changed the heading of the article filter from 'Attachments' to 'All Attachments' 	modified:   src/main/webapp/lib/pyklresource/index.html
  Article attachments will get a ref property based on the parent article id 	modified:   src/main/webapp/js/directives.js 	modified:   src/main/webapp/lib/pykladmin/adminCtrl.js
  Article attachment filter now displays the correct number of attachments by doctype 	modified:   src/main/webapp/js/directives.js 	modified:   src/main/webapp/lib/pyklresource/index.html 	modified:   src/main/webapp/lib/pyklresource/resource.js

Conflicts:
	src/main/webapp/lib/pyklresource/index.html
	src/main/webapp/lib/pyklresource/resource.js

	modified:   src/main/webapp/WEB-INF/api/main.js
	modified:   src/main/webapp/css/app.css
	modified:   src/main/webapp/js/directives.js
	modified:   src/main/webapp/lib/profile/partials/view.html
	modified:   src/main/webapp/lib/pykladmin/adminCtrl.js
	modified:   src/main/webapp/lib/pyklresource/index.html
	modified:   src/main/webapp/lib/pyklresource/resource.js
	modified:   src/main/webapp/partials/tinymceuploads.html
Changes made after merging article attachment filter branch
	modified:   src/main/webapp/WEB-INF/api/articles.js
	modified:   src/main/webapp/WEB-INF/api/main.js
	modified:   src/main/webapp/lib/pyklresource/index.html
	modified:   src/main/webapp/lib/pyklresource/partials/list.html
	modified:   src/main/webapp/lib/pyklresource/resource.js
Merge remote-tracking branch 'origin/develop' into develop

* origin/develop:
  There is/was a constant 500 error, this should fix it.
  Fixed minor text issues, and minor admin login issues. Users trying to access higher permission areas will be redirected to the homepage.

Conflicts:
	src/main/webapp/WEB-INF/api/articles.js

	modified:   src/main/webapp/lib/profile/partials/view.html
	modified:   src/main/webapp/lib/pykladmin/adminCtrl.js
	modified:   src/main/webapp/lib/pyklsecurity/auth.js