diff --git a/akvo/mediaroot/partner_sites/js/build/akvo_ps_machinery_js_min_2fcbb22efb57981a99cd9746f3b98575b4fa2b3c.js b/akvo/mediaroot/partner_sites/js/build/akvo_ps_machinery_js_min_2fcbb22efb57981a99cd9746f3b98575b4fa2b3c.js
deleted file mode 100644
index 677a12f9d5..0000000000
--- a/akvo/mediaroot/partner_sites/js/build/akvo_ps_machinery_js_min_2fcbb22efb57981a99cd9746f3b98575b4fa2b3c.js
+++ /dev/null
@@ -1 +0,0 @@
-function getHeight(a){switch(a){case"feature-side":return 840;case"project-contribute":return 570;case"project-small":return 312;case"project-updates":return 900;case"project-list":return 730;case"project-map":return 300;case"project-narrow":return 840;case"cobranded-narrow":return 911;case"cobranded-short":return 627;case"cobranded-banner":return 234;case"cobranded-leader":return 207;default:return 840;}}function getWidth(a){switch(a){case"feature-side":return 202;case"project-contribute":return 202;case"project-small":return 170;case"project-updates":return 202;case"project-list":return 745;case"project-map":return 600;case"project-narrow":return 170;case"cobranded-narrow":return 170;case"cobranded-short":return 170;case"cobranded-banner":return 468;case"cobranded-leader":return 728;default:return 202;}}function hex_validator(b){var a=/^([0-9a-f]{1,2}){3}$/i;return a.test(b);}function preview_widget(){var l="";var a=true;var p="";if(jQ("#backgroundcolor_pulldown").val()=="x"){p=jQ("#backgroundcolor_text").val();}else{p=jQ("#backgroundcolor_pulldown").val();}if(!(p.length==3||p.length==6)){l+=error1+".<br />";a=false;}else{if(!hex_validator(p)){l+=error2+".<br />";a=false;}}if(akvo_widget_type!="project-map"){var c="";if(jQ("#textcolor_pulldown").val()=="x"){c=jQ("#textcolor_text").val();}else{c=jQ("#textcolor_pulldown").val();}if(!(c.length==3||c.length==6)){jQ("#warning_color").animate({opacity:"show"},"slow");l+=error3+".<br />";a=false;}else{if(!hex_validator(c)){l+=error4+".<br />";a=false;}}}var b=jQ("#akvo_widget_container");var n=jQ("#code");jQ("#warning_color").animate({opacity:"hide"},"fast");if(!a){jQ("#warning_color").html(l);jQ("#warning_color").animate({opacity:"show"},"slow");b.innerHTML="";n.val("");return;}var q="";var i="";var f="";if(akvo_widget_type=="project-map"){q=jQ("#widget_height").val();i=jQ("#widget_width").val();f=jQ("input:radio[name=map_state]:checked").val();}var m=getHeight(akvo_widget_type);var o=getWidth(akvo_widget_type);var h="";var d=akvo_host+"/widgets/projects/map/";d=d+"?bgcolor="+p;d=d+"&height="+q+"&width="+i+"&state="+f;var e=document.createElement("IFRAME");if(akvo_widget_type!="project-map"){var k=document.getElementById("jswidget");if(k){k.src=d;}else{e.setAttribute("src",d);e.height=m;e.width=o;e.frameBorder=0;e.setAttribute("allowTransparency","true");e.setAttribute("id","jswidget");jQ("#akvo_widget_container").append(e);}}else{var g=jQ("#jswidget");if(g){g.remove();console.log("Removed old widget");}e.setAttribute("src",d);e.height=q;e.width=i;e.frameBorder=0;e.setAttribute("allowTransparency","true");e.setAttribute("id","jswidget");jQ("#akvo_widget_container").append(e);}var j='<iframe src="'+d+'" ';if(akvo_widget_type!="project-map"){j+='height="'+m+'" width="'+o+'" frameborder="0" allowTransparency="true"> </iframe>';}else{j+='height="'+q+'" width="'+i+'" frameborder="0" allowTransparency="true"> </iframe>';}n.val(j);}
\ No newline at end of file
diff --git a/akvo/mediaroot/partner_sites/js/build/partner_sites_script_min_a039f7e10cb45144d27a621a0469d61851dd5d02.js b/akvo/mediaroot/partner_sites/js/build/partner_sites_script_min_a039f7e10cb45144d27a621a0469d61851dd5d02.js
deleted file mode 100644
index 396faa4728..0000000000
--- a/akvo/mediaroot/partner_sites/js/build/partner_sites_script_min_a039f7e10cb45144d27a621a0469d61851dd5d02.js
+++ /dev/null
@@ -1 +0,0 @@
-(function(e){var b,l=this,t=l.document,k=e(t),d=false,p=navigator.userAgent.toLowerCase(),n=l.location.hash.replace(/#\//,""),f=function(){return i.TOUCH?"touchstart":"click";},m=(function(){var u=3,x=t.createElement("div"),w=x.getElementsByTagName("i");do{x.innerHTML="<!--[if gt IE "+(++u)+"]><i></i><![endif]-->";}while(w[0]);return u>4?u:b;}()),s=function(){return{html:t.documentElement,body:t.body,head:t.getElementsByTagName("head")[0],title:t.title};},g="data ready thumbnail loadstart loadfinish image play pause progress fullscreen_enter fullscreen_exit idle_enter idle_exit rescale lightbox_open lightbox_close lightbox_image",q=(function(){var u=[];e.each(g.split(" "),function(v,w){u.push(w);if(/_/.test(w)){u.push(w.replace(/_/g,""));}});return u;}()),r=function(u){var v;if(typeof u!=="object"){return u;}e.each(u,function(w,x){if(/^[a-z]+_/.test(w)){v="";e.each(w.split("_"),function(z,y){v+=z>0?y.substr(0,1).toUpperCase()+y.substr(1):y;});u[v]=x;delete u[w];}});return u;},a=function(u){if(e.inArray(u,q)>-1){return i[u.toUpperCase()];}return u;},h={trunk:{},add:function(y,x,w,v){v=v||false;this.clear(y);if(v){var u=x;x=function(){u();h.add(y,x,w);};}this.trunk[y]=l.setTimeout(x,w);},clear:function(w){var u=function(x){l.clearTimeout(this.trunk[x]);delete this.trunk[x];},v;if(!!w&&w in this.trunk){u.call(h,w);}else{if(typeof w==="undefined"){for(v in this.trunk){if(this.trunk.hasOwnProperty(v)){u.call(h,v);}}}}}},o=[],c=(function(){return{array:function(u){return Array.prototype.slice.call(u);},create:function(u,w){w=w||"div";var v=t.createElement(w);v.className=u;return v;},forceStyles:function(v,u){v=e(v);if(v.attr("style")){v.data("styles",v.attr("style")).removeAttr("style");}v.css(u);},revertStyles:function(){e.each(c.array(arguments),function(u,v){v=e(v).removeAttr("style");if(v.data("styles")){v.attr("style",v.data("styles")).data("styles",null);}});},moveOut:function(u){c.forceStyles(u,{position:"absolute",left:-10000});},moveIn:function(){c.revertStyles.apply(c,c.array(arguments));},hide:function(v,w,x){v=e(v);if(!v.data("opacity")){v.data("opacity",v.css("opacity"));}var u={opacity:0};if(w){v.stop().animate(u,w,x);}else{v.css(u);}},show:function(w,x,y){w=e(w);var v=parseFloat(w.data("opacity"))||1,u={opacity:v};if(v===1){w.data("opacity",null);}if(x){w.stop().animate(u,x,y);}else{w.css(u);}},addTimer:function(){h.add.apply(h,c.array(arguments));return this;},clearTimer:function(){h.clear.apply(h,c.array(arguments));return this;},wait:function(w){w=e.extend({until:function(){return false;},success:function(){},error:function(){i.raise("Could not complete wait function.");},timeout:3000},w);var y=c.timestamp(),u,v,x=function(){v=c.timestamp();u=v-y;if(w.until(u)){w.success();return false;}if(v>=y+w.timeout){w.error();return false;}l.setTimeout(x,2);};l.setTimeout(x,2);},toggleQuality:function(u,v){if(m!==7||m!==8||!u){return;}if(typeof v==="undefined"){v=u.style.msInterpolationMode==="nearest-neighbor";}u.style.msInterpolationMode=v?"bicubic":"nearest-neighbor";},insertStyleTag:function(w){var v=t.createElement("style");s().head.appendChild(v);if(v.styleSheet){v.styleSheet.cssText=w;}else{var u=t.createTextNode(w);v.appendChild(u);}},loadScript:function(w,x){var u=false,v=e("<script>").attr({src:w,async:true}).get(0);v.onload=v.onreadystatechange=function(){if(!u&&(!this.readyState||this.readyState==="loaded"||this.readyState==="complete")){u=true;v.onload=v.onreadystatechange=null;if(typeof x==="function"){x.call(this,this);}}};s().head.appendChild(v);},parseValue:function(v){if(typeof v==="number"){return v;}else{if(typeof v==="string"){var u=v.match(/\-?\d/g);return u&&u.constructor===Array?parseInt(u.join(""),10):0;}else{return 0;}}},timestamp:function(){return new Date().getTime();},loadCSS:function(u,z,y){var x,v=false,w;e("link[rel=stylesheet]").each(function(){if(new RegExp(u).test(this.href)){x=this;return false;}});if(typeof z==="function"){y=z;z=b;}y=y||function(){};if(x){y.call(x,x);return x;}w=t.styleSheets.length;if(d){u+="?"+c.timestamp();}if(e("#"+z).length){e("#"+z).attr("href",u);w--;v=true;}else{x=e("<link>").attr({rel:"stylesheet",href:u,id:z}).get(0);l.setTimeout(function(){var A=e('link[rel="stylesheet"], style');if(A.length){A.get(0).parentNode.insertBefore(x,A[0]);}else{s().head.appendChild(x);}if(m){x.attachEvent("onreadystatechange",function(B){if(x.readyState==="complete"){v=true;}});}else{v=true;}},10);}if(typeof y==="function"){c.wait({until:function(){return v&&t.styleSheets.length>w;},success:function(){c.addTimer("css",function(){y.call(x,x);},100);},error:function(){i.raise("Theme CSS could not load");},timeout:1000});}return x;}};}()),j={fade:function(v,u){e(v.next).css("opacity",0).show().animate({opacity:1},v.speed,u);if(v.prev){e(v.prev).css("opacity",1).show().animate({opacity:0},v.speed);}},flash:function(v,u){e(v.next).css("opacity",0);if(v.prev){e(v.prev).animate({opacity:0},(v.speed/2),function(){e(v.next).animate({opacity:1},v.speed,u);});}else{e(v.next).animate({opacity:1},v.speed,u);}},pulse:function(v,u){if(v.prev){e(v.prev).hide();}e(v.next).css("opacity",0).animate({opacity:1},v.speed,u);},slide:function(y,v){var x=e(y.next).parent(),u=this.$("images"),w=this._stageWidth,z=this.getOptions("easing");x.css({left:w*(y.rewind?-1:1)});u.animate({left:w*(y.rewind?1:-1)},{duration:y.speed,queue:false,easing:z,complete:function(){u.css("left",0);x.css("left",0);v();}});},fadeslide:function(w,v){var u=0,z=this.getOptions("easing"),y=this.getStageWidth();if(w.prev){u=c.parseValue(e(w.prev).css("left"));e(w.prev).css({opacity:1,left:u}).animate({opacity:0,left:u+(y*(w.rewind?1:-1))},{duration:w.speed,queue:false,easing:z});}u=c.parseValue(e(w.next).css("left"));e(w.next).css({left:u+(y*(w.rewind?-1:1)),opacity:0}).animate({opacity:1,left:u},{duration:w.speed,complete:v,queue:false,easing:z});}};var i=function(){var C=this;this._theme=b;this._options={};this._playing=false;this._playtime=5000;this._active=null;this._queue={length:0};this._data=[];this._dom={};this._thumbnails=[];this._initialized=false;this._stageWidth=0;this._stageHeight=0;this._target=b;this._id=Math.random();var y="container stage images image-nav image-nav-left image-nav-right info info-text info-title info-description info-author thumbnails thumbnails-list thumbnails-container thumb-nav-left thumb-nav-right loader counter tooltip",x="current total";e.each(y.split(" "),function(E,F){C._dom[F]=c.create("galleria-"+F);});e.each(x.split(" "),function(E,F){C._dom[F]=c.create("galleria-"+F,"span");});var w=this._keyboard={keys:{UP:38,DOWN:40,LEFT:37,RIGHT:39,RETURN:13,ESCAPE:27,BACKSPACE:8,SPACE:32},map:{},bound:false,press:function(F){var E=F.keyCode||F.which;if(E in w.map&&typeof w.map[E]==="function"){w.map[E].call(C,F);}},attach:function(G){var F,E;for(F in G){if(G.hasOwnProperty(F)){E=F.toUpperCase();if(E in w.keys){w.map[w.keys[E]]=G[F];}}}if(!w.bound){w.bound=true;k.bind("keydown",w.press);}},detach:function(){w.bound=false;k.unbind("keydown",w.press);}};var A=this._controls={0:b,1:b,active:0,swap:function(){A.active=A.active?0:1;},getActive:function(){return A[A.active];},getNext:function(){return A[1-A.active];}};var B=this._carousel={next:C.$("thumb-nav-right"),prev:C.$("thumb-nav-left"),width:0,current:0,max:0,hooks:[],update:function(){var F=0,G=0,E=[0];e.each(C._thumbnails,function(I,H){if(H.ready){F+=H.outerWidth||e(H.container).outerWidth(true);E[I+1]=F;G=Math.max(G,H.outerHeight||e(H.container).outerHeight(true));}});C.$("thumbnails").css({width:F,height:G});B.max=F;B.hooks=E;B.width=C.$("thumbnails-list").width();B.setClasses();C.$("thumbnails-container").toggleClass("galleria-carousel",F>B.width);},bindControls:function(){var E;B.next.bind(f(),function(F){F.preventDefault();if(C._options.carouselSteps==="auto"){for(E=B.current;E<B.hooks.length;E++){if(B.hooks[E]-B.hooks[B.current]>B.width){B.set(E-2);break;}}}else{B.set(B.current+C._options.carouselSteps);}});B.prev.bind(f(),function(F){F.preventDefault();if(C._options.carouselSteps==="auto"){for(E=B.current;E>=0;E--){if(B.hooks[B.current]-B.hooks[E]>B.width){B.set(E+2);break;}else{if(E===0){B.set(0);break;}}}}else{B.set(B.current-C._options.carouselSteps);}});},set:function(E){E=Math.max(E,0);while(B.hooks[E-1]+B.width>=B.max&&E>=0){E--;}B.current=E;B.animate();},getLast:function(E){return(E||B.current)-1;},follow:function(E){if(E===0||E===B.hooks.length-2){B.set(E);return;}var F=B.current;while(B.hooks[F]-B.hooks[B.current]<B.width&&F<=B.hooks.length){F++;}if(E-1<B.current){B.set(E-1);}else{if(E+2>F){B.set(E-F+B.current+2);}}},setClasses:function(){B.prev.toggleClass("disabled",!B.current);B.next.toggleClass("disabled",B.hooks[B.current]+B.width>=B.max);},animate:function(F){B.setClasses();var E=B.hooks[B.current]*-1;if(isNaN(E)){return;}C.$("thumbnails").animate({left:E},{duration:C._options.carouselSpeed,easing:C._options.easing,queue:false});}};var D=this._tooltip={initialized:false,open:false,init:function(){D.initialized=true;var E=".galleria-tooltip{padding:3px 8px;max-width:50%;background:#ffe;color:#000;z-index:3;position:absolute;font-size:11px;line-height:1.3opacity:0;box-shadow:0 0 2px rgba(0,0,0,.4);-moz-box-shadow:0 0 2px rgba(0,0,0,.4);-webkit-box-shadow:0 0 2px rgba(0,0,0,.4);}";c.insertStyleTag(E);C.$("tooltip").css("opacity",0.8);c.hide(C.get("tooltip"));},move:function(L){var K=C.getMousePosition(L).x,J=C.getMousePosition(L).y,H=C.$("tooltip"),N=K,M=J,O=H.outerHeight(true)+1,G=H.outerWidth(true),I=O+15;var F=C.$("container").width()-G-2,E=C.$("container").height()-O-2;if(!isNaN(N)&&!isNaN(M)){N+=10;M-=30;N=Math.max(0,Math.min(F,N));M=Math.max(0,Math.min(E,M));if(J<I){M=I;}H.css({left:N,top:M});}},bind:function(F,G){if(!D.initialized){D.init();}var E=function(H,I){D.define(H,I);e(H).hover(function(){c.clearTimer("switch_tooltip");C.$("container").unbind("mousemove",D.move).bind("mousemove",D.move).trigger("mousemove");D.show(H);i.utils.addTimer("tooltip",function(){C.$("tooltip").stop().show();c.show(C.get("tooltip"),400);D.open=true;},D.open?0:500);},function(){C.$("container").unbind("mousemove",D.move);c.clearTimer("tooltip");C.$("tooltip").stop();c.hide(C.get("tooltip"),200,function(){C.$("tooltip").hide();c.addTimer("switch_tooltip",function(){D.open=false;},1000);});});};if(typeof G==="string"){E((F in C._dom?C.get(F):F),G);}else{e.each(F,function(H,I){E(C.get(H),I);});}},show:function(E){E=e(E in C._dom?C.get(E):E);var G=E.data("tt"),F=function(H){l.setTimeout((function(I){return function(){D.move(I);};}(H)),10);E.unbind("mouseup",F);};G=typeof G==="function"?G():G;if(!G){return;}C.$("tooltip").html(G.replace(/\s/,"&nbsp;"));E.bind("mouseup",F);},define:function(F,G){if(typeof G!=="function"){var E=G;G=function(){return E;};}F=e(F in C._dom?C.get(F):F).data("tt",G);D.show(F);}};var z=this._fullscreen={scrolled:0,active:false,enter:function(F){z.active=true;c.hide(C.getActiveImage());C.$("container").addClass("fullscreen");z.scrolled=e(l).scrollTop();c.forceStyles(C.get("container"),{position:"fixed",top:0,left:0,width:"100%",height:"100%",zIndex:10000});var E={height:"100%",overflow:"hidden",margin:0,padding:0};c.forceStyles(s().html,E);c.forceStyles(s().body,E);C.attachKeyboard({escape:C.exitFullscreen,right:C.next,left:C.prev});C.rescale(function(){c.addTimer("fullscreen_enter",function(){c.show(C.getActiveImage());if(typeof F==="function"){F.call(C);}},100);C.trigger(i.FULLSCREEN_ENTER);});e(l).resize(function(){z.scale();});},scale:function(){C.rescale();},exit:function(E){z.active=false;c.hide(C.getActiveImage());C.$("container").removeClass("fullscreen");c.revertStyles(C.get("container"),s().html,s().body);l.scrollTo(0,z.scrolled);C.detachKeyboard();C.rescale(function(){c.addTimer("fullscreen_exit",function(){c.show(C.getActiveImage());if(typeof E==="function"){E.call(C);}},50);C.trigger(i.FULLSCREEN_EXIT);});e(l).unbind("resize",z.scale);}};var v=this._idle={trunk:[],bound:false,add:function(F,H){if(!F){return;}if(!v.bound){v.addEvent();}F=e(F);var G={},E;for(E in H){if(H.hasOwnProperty(E)){G[E]=F.css(E);}}F.data("idle",{from:G,to:H,complete:true,busy:false});v.addTimer();v.trunk.push(F);},remove:function(E){E=jQuery(E);e.each(v.trunk,function(F,G){if(G.length&&!G.not(E).length){C._idle.show(E);C._idle.trunk.splice(F,1);}});if(!v.trunk.length){v.removeEvent();c.clearTimer("idle");}},addEvent:function(){v.bound=true;C.$("container").bind("mousemove click",v.showAll);},removeEvent:function(){v.bound=false;C.$("container").unbind("mousemove click",v.showAll);},addTimer:function(){c.addTimer("idle",function(){C._idle.hide();},C._options.idleTime);},hide:function(){C.trigger(i.IDLE_ENTER);e.each(v.trunk,function(E,F){var G=F.data("idle");if(!G){return;}F.data("idle").complete=false;F.stop().animate(G.to,{duration:C._options.idleSpeed,queue:false,easing:"swing"});});},showAll:function(){c.clearTimer("idle");e.each(C._idle.trunk,function(E,F){C._idle.show(F);});},show:function(E){var F=E.data("idle");if(!F.busy&&!F.complete){F.busy=true;C.trigger(i.IDLE_EXIT);c.clearTimer("idle");E.stop().animate(F.from,{duration:C._options.idleSpeed/2,queue:false,easing:"swing",complete:function(){e(this).data("idle").busy=false;e(this).data("idle").complete=true;}});}v.addTimer();}};var u=this._lightbox={width:0,height:0,initialized:false,active:null,image:null,elems:{},init:function(){C.trigger(i.LIGHTBOX_OPEN);if(u.initialized){return;}u.initialized=true;var E="overlay box content shadow title info close prevholder prev nextholder next counter image",F={},G=C._options,J="",M="position:absolute;",I="lightbox-",H={overlay:"position:fixed;display:none;opacity:"+G.overlayOpacity+";filter:alpha(opacity="+(G.overlayOpacity*100)+");top:0;left:0;width:100%;height:100%;background:"+G.overlayBackground+";z-index:99990",box:"position:fixed;display:none;width:400px;height:400px;top:50%;left:50%;margin-top:-200px;margin-left:-200px;z-index:99991",shadow:M+"background:#000;width:100%;height:100%;",content:M+"background-color:#fff;top:10px;left:10px;right:10px;bottom:10px;overflow:hidden",info:M+"bottom:10px;left:10px;right:10px;color:#444;font:11px/13px arial,sans-serif;height:13px",close:M+"top:10px;right:10px;height:20px;width:20px;background:#fff;text-align:center;cursor:pointer;color:#444;font:16px/22px arial,sans-serif;z-index:99999",image:M+"top:10px;left:10px;right:10px;bottom:30px;overflow:hidden;display:block;",prevholder:M+"width:50%;top:0;bottom:40px;cursor:pointer;",nextholder:M+"width:50%;top:0;bottom:40px;right:-1px;cursor:pointer;",prev:M+"top:50%;margin-top:-20px;height:40px;width:30px;background:#fff;left:20px;display:none;line-height:40px;text-align:center;color:#000",next:M+"top:50%;margin-top:-20px;height:40px;width:30px;background:#fff;right:20px;left:auto;display:none;line-height:40px;text-align:center;color:#000",title:"float:left",counter:"float:right;margin-left:8px;"},K=function(N){return N.hover(function(){e(this).css("color","#bbb");},function(){e(this).css("color","#444");});},L={};if(m===8){H.nextholder+="background:#000;filter:alpha(opacity=0);";H.prevholder+="background:#000;filter:alpha(opacity=0);";}e.each(H,function(N,O){J+=".galleria-"+I+N+"{"+O+"}";});c.insertStyleTag(J);e.each(E.split(" "),function(N,O){C.addElement("lightbox-"+O);F[O]=u.elems[O]=C.get("lightbox-"+O);});u.image=new i.Picture();e.each({box:"shadow content close prevholder nextholder",info:"title counter",content:"info image",prevholder:"prev",nextholder:"next"},function(O,P){var N=[];e.each(P.split(" "),function(Q,R){N.push(I+R);});L[I+O]=N;});C.append(L);e(F.image).append(u.image.container);e(s().body).append(F.overlay,F.box);K(e(F.close).bind(f(),u.hide).html("&#215;"));e.each(["Prev","Next"],function(Q,O){var P=e(F[O.toLowerCase()]).html(/v/.test(O)?"&#8249;&nbsp;":"&nbsp;&#8250;"),N=e(F[O.toLowerCase()+"holder"]);N.bind(f(),function(){u["show"+O]();});if(m<8){P.show();return;}N.hover(function(){P.show();},function(R){P.stop().fadeOut(200);});});e(F.overlay).bind(f(),u.hide);},rescale:function(I){var H=Math.min(e(l).width()-40,u.width),E=Math.min(e(l).height()-60,u.height),G=Math.min(H/u.width,E/u.height),F=(u.width*G)+40,K=(u.height*G)+60,J={width:F,height:K,marginTop:Math.ceil(K/2)*-1,marginLeft:Math.ceil(F/2)*-1};if(I){e(u.elems.box).css(J);}else{e(u.elems.box).animate(J,C._options.lightboxTransitionSpeed,C._options.easing,function(){var M=u.image,L=C._options.lightboxFadeSpeed;C.trigger({type:i.LIGHTBOX_IMAGE,imageTarget:M.image});M.show();c.show(M.image,L);c.show(u.elems.info,L);});}},hide:function(){u.image.image=null;e(l).unbind("resize",u.rescale);e(u.elems.box).hide();c.hide(u.elems.info);c.hide(u.elems.overlay,200,function(){e(this).hide().css("opacity",C._options.overlayOpacity);C.trigger(i.LIGHTBOX_CLOSE);});},showNext:function(){u.show(C.getNext(u.active));},showPrev:function(){u.show(C.getPrev(u.active));},show:function(E){u.active=E=typeof E==="number"?E:C.getIndex();if(!u.initialized){u.init();}e(l).unbind("resize",u.rescale);var G=C.getData(E),F=C.getDataLength();c.hide(u.elems.info);u.image.load(G.image,function(H){u.width=H.original.width;u.height=H.original.height;e(H.image).css({width:"100.5%",height:"100.5%",top:0,zIndex:99998,opacity:0});u.elems.title.innerHTML=G.title;u.elems.counter.innerHTML=(E+1)+" / "+F;e(l).resize(u.rescale);u.rescale();});e(u.elems.overlay).show();e(u.elems.box).show();}};return this;};i.prototype={constructor:i,init:function(w,v){var u=this;v=r(v);o.push(this);this._original={target:w,options:v,data:null};this._target=this._dom.target=w.nodeName?w:e(w).get(0);if(!this._target){i.raise("Target not found.");return;}this._options={autoplay:false,carousel:true,carouselFollow:true,carouselSpeed:400,carouselSteps:"auto",clicknext:false,dataConfig:function(x){return{};},dataSelector:"img",dataSource:this._target,debug:b,easing:"galleria",extend:function(x){},height:"auto",idleTime:3000,idleSpeed:200,imageCrop:false,imageMargin:0,imagePan:false,imagePanSmoothness:12,imagePosition:"50%",keepSource:false,lightboxFadeSpeed:200,lightboxTransition_speed:500,linkSourceTmages:true,maxScaleRatio:b,minScaleRatio:b,overlayOpacity:0.85,overlayBackground:"#0b0b0b",pauseOnInteraction:true,popupLinks:false,preload:2,queue:true,show:0,showInfo:true,showCounter:true,showImagenav:true,thumbCrop:true,thumbEventType:f(),thumbFit:true,thumbMargin:0,thumbQuality:"auto",thumbnails:true,transition:"fade",transitionInitial:b,transitionSpeed:400,width:"auto"};if(v&&v.debug===true){d=true;}e(this._target).children().hide();if(typeof i.theme==="object"){this._init();}else{c.wait({until:function(){return typeof i.theme==="object";},success:function(){u._init.call(u);},error:function(){i.raise("No theme found.",true);},timeout:5000});}},_init:function(){var u=this;if(this._initialized){i.raise("Init failed: Gallery instance already initialized.");return this;}this._initialized=true;if(!i.theme){i.raise("Init failed: No theme found.");return this;}e.extend(true,this._options,i.theme.defaults,this._original.options);this.bind(i.DATA,function(){this._original.data=this._data;this.get("total").innerHTML=this.getDataLength();var y=this.$("container");var x={width:0,height:0};var w=c.create("galleria-image");c.wait({until:function(){e.each(["width","height"],function(B,A){if(u._options[A]&&typeof u._options[A]==="number"){x[A]=u._options[A];}else{x[A]=Math.max(c.parseValue(y.css(A)),c.parseValue(u.$("target").css(A)),y[A](),u.$("target")[A]());}});var z=function(){return true;};if(u._options.thumbnails){u.$("thumbnails").append(w);z=function(){return !!e(w).height();};}return z()&&x.width&&x.height>10;},success:function(){e(w).remove();y.width(x.width);y.height(x.height);if(i.WEBKIT){l.setTimeout(function(){u._run();},1);}else{u._run();}},error:function(){i.raise("Width & Height not found.",true);},timeout:2000});});var v=false;this.bind(i.READY,(function(w){return function(){c.show(this.get("counter"));if(this._options.carousel){this._carousel.bindControls();}if(this._options.autoplay){this.pause();if(typeof this._options.autoplay==="number"){this._playtime=this._options.autoplay;}this.trigger(i.PLAY);this._playing=true;}if(w){if(typeof this._options.show==="number"){this.show(this._options.show);}return;}w=true;if(this._options.clicknext){e.each(this._data,function(x,y){delete y.link;});this.$("stage").css({cursor:"pointer"}).bind(f(),function(x){u.next();});}if(i.History){i.History.change(function(x){var y=parseInt(x.value.replace(/\//,""),10);if(isNaN(y)){l.history.go(-1);}else{u.show(y,b,true);}});}i.theme.init.call(this,this._options);this._options.extend.call(this,this._options);if(/^[0-9]{1,4}$/.test(n)&&i.History){this.show(n,b,true);}else{this.show(this._options.show);}};}(v)));this.append({"info-text":["info-title","info-description","info-author"],info:["info-text"],"image-nav":["image-nav-right","image-nav-left"],stage:["images","loader","counter","image-nav"],"thumbnails-list":["thumbnails"],"thumbnails-container":["thumb-nav-left","thumbnails-list","thumb-nav-right"],container:["stage","thumbnails-container","info","tooltip"]});c.hide(this.$("counter").append(this.get("current")," / ",this.get("total")));this.setCounter("&#8211;");c.hide(u.get("tooltip"));e.each(new Array(2),function(w){var x=new i.Picture();e(x.container).css({position:"absolute",top:0,left:0});u.$("images").append(x.container);u._controls[w]=x;});this.$("images").css({position:"relative",top:0,left:0,width:"100%",height:"100%"});this.$("thumbnails, thumbnails-list").css({overflow:"hidden",position:"relative"});this.$("image-nav-right, image-nav-left").bind(f(),function(x){if(u._options.clicknext){x.stopPropagation();}if(u._options.pause_on_interaction){u.pause();}var w=/right/.test(this.className)?"next":"prev";u[w]();});e.each(["info","counter","image-nav"],function(w,x){if(u._options["show"+x.substr(0,1).toUpperCase()+x.substr(1).replace(/-/,"")]===false){c.moveOut(u.get(x.toLowerCase()));}});this.load();if(!this._options.keep_source&&!m){this._target.innerHTML="";}this.$("target").append(this.get("container"));if(this._options.carousel){this.bind(i.THUMBNAIL,function(){this.updateCarousel();});}return this;},_createThumbnails:function(){var B,u,v,A,F,G=this,w=this._options,y=(function(){var H=G.$("thumbnails").find(".active");if(!H.length){return false;}return H.find("img").attr("src");}()),x=typeof w.thumbnails==="string"?w.thumbnails.toLowerCase():null,C=function(H){return t.defaultView&&t.defaultView.getComputedStyle?t.defaultView.getComputedStyle(v.container,null)[H]:F.css(H);},D=function(J,I,H){return function(){e(H).append(J);G.trigger({type:i.THUMBNAIL,thumbTarget:J,index:I});};},E=function(I){if(w.pauseOnInteraction){G.pause();}var H=e(I.currentTarget).data("index");if(G.getIndex()!==H){G.show(H);}I.preventDefault();},z=function(H){H.scale({width:H.data.width,height:H.data.height,crop:w.thumbCrop,margin:w.thumbMargin,complete:function(K){var M=["left","top"],J=["Width","Height"],I,L;e.each(J,function(N,O){I=O.toLowerCase();if((w.thumbCrop!==true||w.thumbCrop===I)&&w.thumbFit){L={};L[I]=K[I];e(K.container).css(L);L={};L[M[N]]=0;e(K.image).css(L);}K["outer"+O]=e(K.container)["outer"+O](true);});c.toggleQuality(K.image,w.thumbQuality===true||(w.thumbQuality==="auto"&&K.original.width<K.width*3));G.trigger({type:i.THUMBNAIL,thumbTarget:K.image,index:K.data.order});}});};this._thumbnails=[];this.$("thumbnails").empty();for(B=0;this._data[B];B++){A=this._data[B];if(w.thumbnails===true){v=new i.Picture(B);u=A.thumb||A.image;this.$("thumbnails").append(v.container);F=e(v.container);v.data={width:c.parseValue(C("width")),height:c.parseValue(C("height")),order:B};if(w.thumbFit&&w.thumbCrop!==true){F.css({width:0,height:0});}else{F.css({width:v.data.width,height:v.data.height});}v.load(u,z);if(w.preload==="all"){v.add(A.image);}}else{if(x==="empty"||x==="numbers"){v={container:c.create("galleria-image"),image:c.create("img","span"),ready:true};if(x==="numbers"){e(v.image).text(B+1);}this.$("thumbnails").append(v.container);l.setTimeout((D)(v.image,B,v.container),50+(B*20));}else{v={container:null,image:null};}}e(v.container).add(w.keepSource&&w.linkSourceImages?A.original:null).data("index",B).bind(w.thumbEventType,E);if(y===u){e(v.container).addClass("active");}this._thumbnails.push(v);}},_run:function(){var u=this;u._createThumbnails();c.wait({until:function(){if(i.OPERA){u.$("stage").css("display","inline-block");}u._stageWidth=u.$("stage").width();u._stageHeight=u.$("stage").height();return(u._stageWidth&&u._stageHeight>50);},success:function(){u.trigger(i.READY);},error:function(){i.raise("Stage measures not found",true);}});},load:function(x,u,w){var v=this;this._data=[];this._thumbnails=[];this.$("thumbnails").empty();if(typeof u==="function"){w=u;u=null;}x=x||this._options.dataSource;u=u||this._options.dataSelector;w=w||this._options.dataConfig;if(x.constructor===Array){if(this.validate(x)){this._data=x;this._parseData().trigger(i.DATA);}else{i.raise("Load failed: JSON Array not valid.");}return this;}e(x).find(u).each(function(A,z){z=e(z);var C={},B=z.parent(),y=B.attr("href");if(/\.(png|gif|jpg|jpeg)(\?.*)?$/i.test(y)){C.image=y;}else{if(y){C.link=y;}}v._data.push(e.extend({title:z.attr("title"),thumb:z.attr("src"),image:z.attr("src"),description:z.attr("alt"),link:z.attr("longdesc"),original:z.get(0)},C,w(z)));});if(this.getDataLength()){this.trigger(i.DATA);}else{i.raise("Load failed: no data found.");}return this;},_parseData:function(){var u=this;e.each(this._data,function(v,w){if("thumb" in w===false){u._data[v].thumb=w.image;}});return this;},splice:function(){Array.prototype.splice.apply(this._data,c.array(arguments));return this._parseData()._createThumbnails();},push:function(){Array.prototype.push.apply(this._data,c.array(arguments));return this._parseData()._createThumbnails();},_getActive:function(){return this._controls.getActive();},validate:function(u){return true;},bind:function(v,u){v=a(v);this.$("container").bind(v,this.proxy(u));return this;},unbind:function(u){u=a(u);this.$("container").unbind(u);return this;},trigger:function(u){u=typeof u==="object"?e.extend(u,{scope:this}):{type:a(u),scope:this};this.$("container").trigger(u);return this;},addIdleState:function(v,u){this._idle.add.apply(this._idle,c.array(arguments));return this;},removeIdleState:function(u){this._idle.remove.apply(this._idle,c.array(arguments));return this;},enterIdleMode:function(){this._idle.hide();return this;},exitIdleMode:function(){this._idle.showAll();return this;},enterFullscreen:function(u){this._fullscreen.enter.apply(this,c.array(arguments));return this;},exitFullscreen:function(u){this._fullscreen.exit.apply(this,c.array(arguments));return this;},toggleFullscreen:function(u){this._fullscreen[this.isFullscreen()?"exit":"enter"].apply(this,c.array(arguments));return this;},bindTooltip:function(u,v){this._tooltip.bind.apply(this._tooltip,c.array(arguments));return this;},defineTooltip:function(u,v){this._tooltip.define.apply(this._tooltip,c.array(arguments));return this;},refreshTooltip:function(u){this._tooltip.show.apply(this._tooltip,c.array(arguments));return this;},openLightbox:function(){this._lightbox.show.apply(this._lightbox,c.array(arguments));return this;},closeLightbox:function(){this._lightbox.hide.apply(this._lightbox,c.array(arguments));return this;},getActiveImage:function(){return this._getActive().image||b;},getActiveThumb:function(){return this._thumbnails[this._active].image||b;},getMousePosition:function(u){return{x:u.pageX-this.$("container").offset().left,y:u.pageY-this.$("container").offset().top};},addPan:function(C){if(this._options.imageCrop===false){return;}C=e(C||this.getActiveImage());var M=this,L=C.width()/2,I=C.height()/2,K=parseInt(C.css("left"),10),J=parseInt(C.css("top"),10),w=K||0,v=J||0,H=0,G=0,A=false,F=c.timestamp(),u=0,z=0,E=function(N,y,O){if(N>0){z=Math.round(Math.max(N*-1,Math.min(0,y)));if(u!==z){u=z;if(m===8){C.parent()["scroll"+O](z*-1);}else{var x={};x[O.toLowerCase()]=z;C.css(x);}}}},B=function(x){if(c.timestamp()-F<50){return;}A=true;L=M.getMousePosition(x).x;I=M.getMousePosition(x).y;},D=function(x){if(!A){return;}H=C.width()-M._stageWidth;G=C.height()-M._stageHeight;K=L/M._stageWidth*H*-1;J=I/M._stageHeight*G*-1;w+=(K-w)/M._options.imagePanSmoothness;v+=(J-v)/M._options.imagePanSmoothness;E(G,v,"Top");E(H,w,"Left");};if(m===8){C.parent().scrollTop(v*-1).scrollLeft(w*-1);C.css({top:0,left:0});}this.$("stage").unbind("mousemove",B).bind("mousemove",B);c.addTimer("pan",D,50,true);return this;},proxy:function(v,u){if(typeof v!=="function"){return function(){};}u=u||this;return function(){return v.apply(u,c.array(arguments));};},removePan:function(){this.$("stage").unbind("mousemove");c.clearTimer("pan");return this;},addElement:function(v){var u=this._dom;e.each(c.array(arguments),function(x,w){u[w]=c.create("galleria-"+w);});return this;},attachKeyboard:function(u){this._keyboard.attach.apply(this._keyboard,c.array(arguments));return this;},detachKeyboard:function(){this._keyboard.detach.apply(this._keyboard,c.array(arguments));return this;},appendChild:function(v,u){this.$(v).append(this.get(u)||u);return this;},prependChild:function(v,u){this.$(v).prepend(this.get(u)||u);return this;},remove:function(u){this.$(c.array(arguments).join(",")).remove();return this;},append:function(w){var v,u;for(v in w){if(w.hasOwnProperty(v)){if(w[v].constructor===Array){for(u=0;w[v][u];u++){this.appendChild(v,w[v][u]);}}else{this.appendChild(v,w[v]);}}}return this;},_scaleImage:function(v,u){u=e.extend({width:this._stageWidth,height:this._stageHeight,crop:this._options.imageCrop,max:this._options.maxScaleRatio,min:this._options.minScaleRatio,margin:this._options.imageMargin,position:this._options.imagePosition},u);(v||this._controls.getActive()).scale(u);return this;},updateCarousel:function(){this._carousel.update();return this;},rescale:function(x,u,v){var w=this;if(typeof x==="function"){v=x;x=b;}var y=function(){w._stageWidth=x||w.$("stage").width();w._stageHeight=u||w.$("stage").height();w._scaleImage();if(w._options.carousel){w.updateCarousel();}w.trigger(i.RESCALE);if(typeof v==="function"){v.call(w);}};if(i.WEBKIT&&!x&&!u){c.addTimer("scale",y,5);}else{y.call(w);}return this;},refreshImage:function(){this._scaleImage();if(this._options.imagePan){this.addPan();}return this;},show:function(v,u,w){if(v===false||(!this._options.queue&&this._queue.stalled)){return;}v=Math.max(0,Math.min(parseInt(v,10),this.getDataLength()-1));u=typeof u!=="undefined"?!!u:v<this.getIndex();w=w||false;if(!w&&i.History){i.History.value(v.toString());return;}this._active=v;Array.prototype.push.call(this._queue,{index:v,rewind:u});if(!this._queue.stalled){this._show();}return this;},_show:function(){var G=this,E=this._queue[0],C=this.getData(E.index);if(!C){return;}var u=C.image,A=this._controls.getActive(),D=this._controls.getNext(),z=D.isCached(u),v=this._thumbnails[E.index];var x=function(){var H;G._queue.stalled=false;c.toggleQuality(D.image,G._options.imageQuality);e(A.container).css({zIndex:0,opacity:0});e(D.container).css({zIndex:1,opacity:1});G._controls.swap();if(G._options.imagePan){G.addPan(D.image);}if(C.link){e(D.image).css({cursor:"pointer"}).bind(f(),function(){if(G._options.popupLinks){H=l.open(C.link,"_blank");}else{l.location.href=C.link;}});}Array.prototype.shift.call(G._queue);if(G._queue.length){G._show();}G._playCheck();G.trigger({type:i.IMAGE,index:E.index,imageTarget:D.image,thumbTarget:v.image});};if(this._options.carousel&&this._options.carouselFollow){this._carousel.follow(E.index);}if(this._options.preload){var w,B,y=this.getNext();try{for(B=this._options.preload;B>0;B--){w=new i.Picture();w.add(G.getData(y).image);y=G.getNext(y);}}catch(F){}}c.show(D.container);e(G._thumbnails[E.index].container).addClass("active").siblings(".active").removeClass("active");G.trigger({type:i.LOADSTART,cached:z,index:E.index,imageTarget:D.image,thumbTarget:v.image});D.load(u,function(H){G._scaleImage(H,{complete:function(I){c.show(I.container);if("image" in A){c.toggleQuality(A.image,false);}c.toggleQuality(I.image,false);G._queue.stalled=true;G.removePan();G.setInfo(E.index);G.setCounter(E.index);G.trigger({type:i.LOADFINISH,cached:z,index:E.index,imageTarget:I.image,thumbTarget:G._thumbnails[E.index].image});var K=A.image===null&&G._options.transitionInitial?G._options.transition_Initial:G._options.transition;if(K in j===false){x();}else{var J={prev:A.image,next:I.image,rewind:E.rewind,speed:G._options.transitionSpeed||400};j[K].call(G,J,x);}}});});},getNext:function(u){u=typeof u==="number"?u:this.getIndex();return u===this.getDataLength()-1?0:u+1;},getPrev:function(u){u=typeof u==="number"?u:this.getIndex();return u===0?this.getDataLength()-1:u-1;},next:function(){if(this.getDataLength()>1){this.show(this.getNext(),false);}return this;},prev:function(){if(this.getDataLength()>1){this.show(this.getPrev(),true);}return this;},get:function(u){return u in this._dom?this._dom[u]:null;},getData:function(u){return u in this._data?this._data[u]:this._data[this._active];},getDataLength:function(){return this._data.length;},getIndex:function(){return typeof this._active==="number"?this._active:false;},getStageHeight:function(){return this._stageHeight;},getStageWidth:function(){return this._stageWidth;},getOptions:function(u){return typeof u==="undefined"?this._options:this._options[u];},setOptions:function(u,v){if(typeof u==="object"){e.extend(this._options,u);}else{this._options[u]=v;}return this;},play:function(u){this._playing=true;this._playtime=u||this._playtime;this._playCheck();this.trigger(i.PLAY);return this;},pause:function(){this._playing=false;this.trigger(i.PAUSE);return this;},playToggle:function(u){return(this._playing)?this.pause():this.play(u);},isPlaying:function(){return this._playing;},isFullscreen:function(){return this._fullscreen.active;},_playCheck:function(){var v=this,y=0,u=20,w=c.timestamp(),z="play"+this._id;if(this._playing){c.clearTimer(z);var x=function(){y=c.timestamp()-w;if(y>=v._playtime&&v._playing){c.clearTimer(z);v.next();return;}if(v._playing){v.trigger({type:i.PROGRESS,percent:Math.ceil(y/v._playtime*100),seconds:Math.floor(y/1000),milliseconds:y});c.addTimer(z,x,u);}};c.addTimer(z,x,u);}},setIndex:function(u){this._active=u;return this;},setCounter:function(v){if(typeof v==="number"){v++;}else{if(typeof v==="undefined"){v=this.getIndex()+1;}}this.get("current").innerHTML=v;if(m){var x=this.$("counter"),u=x.css("opacity"),w=x.attr("style");if(w&&parseInt(u,10)===1){x.attr("style",w.replace(/filter[^\;]+\;/i,""));}else{this.$("counter").css("opacity",u);}}return this;},setInfo:function(v){var u=this,w=this.getData(v);e.each(["title","description","author"],function(x,y){var z=u.$("info-"+y);if(!!w[y]){z[w[y].length?"show":"hide"]().html(w[y]);}else{z.empty().hide();}});return this;},hasInfo:function(v){var u="title description".split(" "),w;for(w=0;u[w];w++){if(!!this.getData(v)[u[w]]){return true;}}return false;},jQuery:function(x){var u=this,v=[];e.each(x.split(","),function(y,z){z=e.trim(z);if(u.get(z)){v.push(z);}});var w=e(u.get(v.shift()));e.each(v,function(y,z){w=w.add(u.get(z));});return w;},$:function(u){return this.jQuery.apply(this,c.array(arguments));}};e.each(q,function(u,w){var v=/_/.test(w)?w.replace(/_/g,""):w;i[w.toUpperCase()]="galleria."+v;});e.extend(i,{IE9:m===9,IE8:m===8,IE7:m===7,IE6:m===6,IE:!!m,WEBKIT:/webkit/.test(p),SAFARI:/safari/.test(p),CHROME:/chrome/.test(p),QUIRK:(m&&t.compatMode&&t.compatMode==="BackCompat"),MAC:/mac/.test(navigator.platform.toLowerCase()),OPERA:!!l.opera,IPHONE:/iphone/.test(p),IPAD:/ipad/.test(p),ANDROID:/android/.test(p),TOUCH:!!(/iphone/.test(p)||/ipad/.test(p)||/android/.test(p))});i.addTheme=function(w){if(!w.name){i.raise("No theme name specified");}if(typeof w.defaults!=="object"){w.defaults={};}else{w.defaults=r(w.defaults);}var u=false,v;if(typeof w.css==="string"){e("link").each(function(x,y){v=new RegExp(w.css);if(v.test(y.href)){u=true;i.theme=w;return false;}});if(!u){e("script").each(function(y,x){v=new RegExp("galleria\\."+w.name.toLowerCase()+"\\.");if(v.test(x.src)){u=x.src.replace(/[^\/]*$/,"")+w.css;c.addTimer("css",function(){c.loadCSS(u,"galleria-theme",function(){i.theme=w;});},1);}});}if(!u){i.raise("No theme CSS loaded");}}else{i.theme=w;}return w;};i.loadTheme=function(x,v){var u=false,w=o.length;i.theme=b;c.loadScript(x,function(){u=true;});c.wait({until:function(){return u;},error:function(){i.raise("Theme at "+x+" could not load, check theme path.",true);},success:function(){if(w){var y=[];e.each(i.get(),function(A,z){var C=e.extend(z._original.options,{data_source:z._data},v);z.$("container").remove();var B=new i();B._id=z._id;B.init(z._original.target,C);y.push(B);});o=y;}},timeout:2000});};i.get=function(u){if(!!o[u]){return o[u];}else{if(typeof u!=="number"){return o;}else{i.raise("Gallery index "+u+" not found");}}};i.addTransition=function(u,v){j[u]=v;};i.utils=c;i.log=function(){try{l.console.log.apply(l.console,c.array(arguments));}catch(u){try{l.opera.postError.apply(l.opera,arguments);}catch(v){l.alert(c.array(arguments).split(", "));}}};i.raise=function(w,v){if(d||v){var u=v?"Fatal error":"Error";throw new Error(u+": "+w);}};i.Picture=function(u){this.id=u||null;this.image=null;this.container=c.create("galleria-image");e(this.container).css({overflow:"hidden",position:"relative"});this.original={width:0,height:0};this.ready=false;this.loaded=false;};i.Picture.prototype={cache:{},add:function(y){var v=0,u=this,x=new Image(),w=function(){if((!this.width||!this.height)&&v<1000){v++;e(x).load(w).attr("src",y+"?"+new Date().getTime());}u.original={height:this.height,width:this.width};u.cache[y]=y;u.loaded=true;};e(x).css("display","block");if(u.cache[y]){x.src=y;w.call(x);return x;}e(x).load(w).attr("src",y);return x;},show:function(){c.show(this.image);},hide:function(){c.moveOut(this.image);},clear:function(){this.image=null;},isCached:function(u){return !!this.cache[u];},load:function(v,w){var u=this;e(this.container).empty(true);this.image=this.add(v);c.hide(this.image);e(this.container).append(this.image);c.wait({until:function(){return u.loaded&&u.image.complete&&u.original.width&&u.image.width;},success:function(){l.setTimeout(function(){w.call(u,u);},50);},error:function(){l.setTimeout(function(){w.call(u,u);},50);i.raise("image not loaded in 10 seconds: "+v);},timeout:10000});return this.container;},scale:function(w){w=e.extend({width:0,height:0,min:b,max:b,margin:0,complete:function(){},position:"center",crop:false},w);if(!this.image){return this.container;}var x,u,v=this,y=e(v.container);c.wait({until:function(){x=w.width||y.width()||c.parseValue(y.css("width"));u=w.height||y.height()||c.parseValue(y.css("height"));return x&&u;},success:function(){var D=(x-w.margin*2)/v.original.width,z=(u-w.margin*2)/v.original.height,F={"true":Math.max(D,z),width:D,height:z,"false":Math.min(D,z)},B=F[w.crop.toString()];if(w.max){B=Math.min(w.max,B);}if(w.min){B=Math.max(w.min,B);}e(v.container).width(x).height(u);e.each(["width","height"],function(I,H){e(v.image)[H](v.image[H]=v[H]=Math.round(v.original[H]*B));});var G={},A={},C=function(L,J,K){var I=0;if(/\%/.test(L)){var M=parseInt(L,10)/100,H=v.image[J]||e(v.image)[J]();I=Math.ceil(H*-1*M+K*M);}else{I=c.parseValue(L);}return I;},E={top:{top:0},left:{left:0},right:{left:"100%"},bottom:{top:"100%"}};e.each(w.position.toLowerCase().split(" "),function(H,I){if(I==="center"){I="50%";}G[H?"top":"left"]=I;});e.each(G,function(H,I){if(E.hasOwnProperty(I)){e.extend(A,E[I]);}});G=G.top?e.extend(G,A):A;G=e.extend({top:"50%",left:"50%"},G);e(v.image).css({position:"relative",top:C(G.top,"height",u),left:C(G.left,"width",x)});v.show();v.ready=true;w.complete.call(v,v);},error:function(){i.raise("Could not scale image: "+v.image.src);},timeout:1000});return this;}};e.extend(e.easing,{galleria:function(v,w,u,y,x){if((w/=x/2)<1){return y/2*w*w*w*w+u;}return -y/2*((w-=2)*w*w*w-2)+u;},galleriaIn:function(v,w,u,y,x){return y*(w/=x)*w*w*w+u;},galleriaOut:function(v,w,u,y,x){return -y*((w=w/x-1)*w*w*w-1)+u;}});e.fn.galleria=function(u){return this.each(function(){var v=new i();v.init(this,u);});};l.Galleria=i;}(jQuery));
\ No newline at end of file
diff --git a/akvo/rsr/admin.py b/akvo/rsr/admin.py
index 767119a3ab..b6ee47e352 100644
--- a/akvo/rsr/admin.py
+++ b/akvo/rsr/admin.py
@@ -4,7 +4,7 @@
 from django.conf import settings
 from django.contrib import admin
 from django.contrib.admin import helpers, widgets
-from django.contrib.admin.util import unquote
+from django.contrib.admin.util import unquote, flatten_fieldsets
 from django.contrib.auth.admin import GroupAdmin
 from django.contrib.auth.models import Group
 from django.contrib.contenttypes import generic
@@ -112,14 +112,19 @@ class InternalOrganisationIDInline(admin.TabularInline):
     verbose_name = 'internal organisation ID'
     verbose_name_plural = 'internal organisation IDs'
 
+
 class OrganisationAdmin(admin.ModelAdmin):
+    # NOTE: The change_form.html template relies on the fieldsets to put the inline forms correctly.
+    # If the fieldsets are changed, the template may need fixing too
     fieldsets = (
-        (_(u'General information'), {'fields': ('name', 'long_name', 'organisation_type', 'new_organisation_type', 'logo', 'url', 'iati_org_id', 'language',)}),
+        (_(u'General information'), {'fields': ('name', 'long_name', 'partner_types', 'organisation_type',
+                                                'new_organisation_type', 'logo', 'url', 'iati_org_id', 'language',)}),
         (_(u'Contact information'), {'fields': ('phone', 'mobile', 'fax',  'contact_person',  'contact_email', ), }),
         (_(u'About the organisation'), {'fields': ('description', )}),
     )
     inlines = (OrganisationLocationInline, InternalOrganisationIDInline,)
     exclude = ('internal_org_ids',)
+    readonly_fields = ('partner_types',)
     list_display = ('name', 'long_name', 'website', 'language',)
     search_fields = ('name', 'long_name',)
 
@@ -140,6 +145,37 @@ def __init__(self, model, admin_site):
         self.formfield_overrides = {ImageWithThumbnailsField: {'widget': widgets.AdminFileWidget}, }
         super(OrganisationAdmin, self).__init__(model, admin_site)
 
+    def allowed_partner_types(self, obj):
+        return ', '.join([pt.label for pt in obj.partner_types.all()])
+
+    def get_list_display(self, request):
+        # see the notes fields in the change list if you have the right permissions
+        if request.user.has_perm(self.opts.app_label + '.' + self.opts.get_change_permission()):
+            return list(self.list_display) + ['allowed_partner_types']
+        return super(OrganisationAdmin, self).get_list_display(request)
+
+    def get_readonly_fields(self, request, obj):
+        # parter_types is read only unless you have change permission for organisations
+        if not request.user.has_perm(self.opts.app_label + '.' + self.opts.get_change_permission()):
+            self.readonly_fields = ('partner_types',)
+            # hack to set the help text
+            try:
+                field = [f for f in obj._meta.local_many_to_many if f.name == 'partner_types']
+                if len(field) > 0:
+                    field[0].help_text = 'The allowed partner types for this organisation'
+            except:
+                pass
+        else:
+            self.readonly_fields = ()
+            # hack to set the help text
+            try:
+                field = [f for f in obj._meta.local_many_to_many if f.name == 'partner_types']
+                if len(field) > 0:
+                    field[0].help_text = 'The allowed partner types for this organisation. Hold down "Control", or "Command" on a Mac, to select more than one.'
+            except:
+                pass
+        return super(OrganisationAdmin, self).get_readonly_fields(request, obj)
+
     def queryset(self, request):
         qs = super(OrganisationAdmin, self).queryset(request)
         opts = self.opts
@@ -398,10 +434,8 @@ def clean(self):
         def duplicates_in_list(seq):
             "return True if the list contains duplicate items"
             seq_set = list(set(seq))
-            # need to sort since set() doesn't preserver order
-            seq.sort()
-            seq_set.sort()
-            return seq != seq_set
+            # if the set isn't of the same length as the list there must be dupes in the list
+            return len(seq) != len(seq_set)
 
         user = self.request.user
         user_profile = user.get_profile()
@@ -439,13 +473,32 @@ def duplicates_in_list(seq):
         for org, types in partner_types.items():
             # are there duplicates in the list of partner_types?
             if duplicates_in_list(types):
-                errors += [_(u'%s has duplicate partner types of the same kind.' % org)]
+                errors += [_(u'{org} has duplicate partner types of the same kind.'.format(org=org))]
+
         self._non_form_errors = ErrorList(errors)
 
 
+class RSR_PartnershipInlineForm(forms.ModelForm):
+    class Meta:
+        model = get_model('rsr', 'Partnership')
+
+    def clean_partner_type(self):
+        partner_types = get_model('rsr', 'PartnerType').objects.all()
+        partner_types_dict = {partner_type.id: partner_type.label for partner_type in partner_types}
+        allowed = [partner_type.pk for partner_type in self.cleaned_data['organisation'].partner_types.all()]
+        data = self.cleaned_data['partner_type']
+        if data not in allowed:
+            raise forms.ValidationError("{org} is not allowed to be a {partner_type_label}".format(
+                org=self.cleaned_data['organisation'],
+                partner_type_label=partner_types_dict[data]
+            ))
+        return data
+
+
 class PartnershipInline(admin.TabularInline):
     model = get_model('rsr', 'Partnership')
     extra = 1
+    form = RSR_PartnershipInlineForm
     formset = RSR_PartnershipInlineFormFormSet
 
     def get_formset(self, request, *args, **kwargs):
@@ -1103,14 +1156,41 @@ class PaymentGatewaySelectorAdmin(admin.ModelAdmin):
 
 class PartnerSiteAdmin(admin.ModelAdmin):
     form = PartnerSiteAdminForm
-
     fieldsets = (
-        (u'General', dict(fields=('organisation', 'enabled',))),
+        (u'General', dict(fields=('organisation', 'enabled', 'notes',))),
         (u'HTTP', dict(fields=('hostname', 'cname', 'custom_return_url',))),
         (u'Style and content', dict(fields=('about_box', 'about_image', 'custom_css', 'custom_logo', 'custom_favicon',))),
         (u'Languages and translation', dict(fields=('default_language', 'ui_translation', 'google_translation',)))
     )
-    list_display = '__unicode__', 'full_domain'
+    # the notes field is not shown to everyone
+    restricted_fieldsets = (
+        (u'General', dict(fields=('organisation', 'enabled',))),
+        (u'HTTP', dict(fields=('hostname', 'cname', 'custom_return_url',))),
+        (u'Style and content',
+         dict(fields=('about_box', 'about_image', 'custom_css', 'custom_logo', 'custom_favicon',))),
+        (u'Languages and translation', dict(fields=('default_language', 'ui_translation', 'google_translation',)))
+    )
+    list_display = '__unicode__', 'full_domain', 'enabled',
+
+    def get_fieldsets(self, request, obj=None):
+        # don't show the notes field unless you have "add" permission on the PartnerSite model
+        # (currently means an Akvo staff user (or superuser))
+        if request.user.has_perm(self.opts.app_label + '.' + self.opts.get_add_permission()):
+            return super(PartnerSiteAdmin, self).get_fieldsets(request, obj)
+        return self.restricted_fieldsets
+
+    def get_form(self, request, obj=None, **kwargs):
+        """ Workaround bug http://code.djangoproject.com/ticket/9360
+        """
+        return super(PartnerSiteAdmin, self).get_form(
+            request, obj, fields=flatten_fieldsets(self.get_fieldsets(request, obj))
+        )
+
+    def get_list_display(self, request):
+        # see the notes fields in the change list if you have the right permissions
+        if request.user.has_perm(self.opts.app_label + '.' + self.opts.get_add_permission()):
+            return list(self.list_display) + ['notes']
+        return super(PartnerSiteAdmin, self).get_list_display(request)
 
     def get_actions(self, request):
         """ Remove delete admin action for "non certified" users"""
diff --git a/akvo/rsr/management.py b/akvo/rsr/management.py
index 2f1b0308a8..2634a9854d 100644
--- a/akvo/rsr/management.py
+++ b/akvo/rsr/management.py
@@ -149,7 +149,18 @@ def create_limited_change_permissions(sender, **kwargs):
                 else:
                     print 'RSR limited change %s Permission already exists in the database' % model_name
 
+        def create_partner_types(sender, **kwargs):
+            print "Adding PartnerType objects"
+            print
+            for id, label in rsr.Partnership.PARTNER_TYPES:
+                partner_type, created = rsr.PartnerType.objects.get_or_create(id=id, label=label)
+                if created:
+                    print 'Created PartnerType {partner_type}'.format(partner_type=partner_type)
+                else:
+                    print 'Found existing PartnerType {partner_type}'.format(partner_type=partner_type)
+
         post_syncdb.connect(create_limited_change_permissions, sender=rsr)
+        post_syncdb.connect(create_partner_types, sender=rsr)
 
 
 
diff --git a/akvo/rsr/migrations/0036_auto__add_field_partnersite_notes.py b/akvo/rsr/migrations/0036_auto__add_field_partnersite_notes.py
new file mode 100644
index 0000000000..d1fa72d041
--- /dev/null
+++ b/akvo/rsr/migrations/0036_auto__add_field_partnersite_notes.py
@@ -0,0 +1,365 @@
+    # -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Adding field 'PartnerSite.notes'
+        db.add_column('rsr_partnersite', 'notes',
+                      self.gf('django.db.models.fields.TextField')(default='', blank=True),
+                      keep_default=False)
+
+
+    def backwards(self, orm):
+        # Deleting field 'PartnerSite.notes'
+        db.delete_column('rsr_partnersite', 'notes')
+
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'gateway.gateway': {
+            'Meta': {'object_name': 'Gateway'},
+            'host_name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'message': ('django.db.models.fields.CharField', [], {'max_length': '30'}),
+            'msg_id': ('django.db.models.fields.CharField', [], {'max_length': '30'}),
+            'name': ('django.db.models.fields.SlugField', [], {'max_length': '30'}),
+            'receiver': ('django.db.models.fields.CharField', [], {'max_length': '30'}),
+            'send_path': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'sender': ('django.db.models.fields.CharField', [], {'max_length': '30'}),
+            'timestamp': ('django.db.models.fields.CharField', [], {'max_length': '30'})
+        },
+        'gateway.gatewaynumber': {
+            'Meta': {'object_name': 'GatewayNumber'},
+            'gateway': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['gateway.Gateway']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'number': ('django.db.models.fields.CharField', [], {'max_length': '30'})
+        },
+        'rsr.benchmark': {
+            'Meta': {'ordering': "('category__name', 'name__order')", 'object_name': 'Benchmark'},
+            'category': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['rsr.Category']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['rsr.Benchmarkname']"}),
+            'project': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "u'benchmarks'", 'to': "orm['rsr.Project']"}),
+            'value': ('django.db.models.fields.IntegerField', [], {})
+        },
+        'rsr.benchmarkname': {
+            'Meta': {'ordering': "['order', 'name']", 'object_name': 'Benchmarkname'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '80'}),
+            'order': ('django.db.models.fields.IntegerField', [], {'default': '0'})
+        },
+        'rsr.budgetitem': {
+            'Meta': {'ordering': "('label',)", 'unique_together': "(('project', 'label'),)", 'object_name': 'BudgetItem'},
+            'amount': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '2'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'label': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['rsr.BudgetItemLabel']"}),
+            'other_extra': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),
+            'project': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'budget_items'", 'to': "orm['rsr.Project']"})
+        },
+        'rsr.budgetitemlabel': {
+            'Meta': {'ordering': "('label',)", 'object_name': 'BudgetItemLabel'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '20', 'db_index': 'True'})
+        },
+        'rsr.category': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Category'},
+            'benchmarknames': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['rsr.Benchmarkname']", 'symmetrical': 'False', 'blank': 'True'}),
+            'focus_area': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'categories'", 'symmetrical': 'False', 'to': "orm['rsr.FocusArea']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50', 'db_index': 'True'})
+        },
+        'rsr.country': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Country'},
+            'continent': ('django.db.models.fields.CharField', [], {'max_length': '20', 'db_index': 'True'}),
+            'continent_code': ('django.db.models.fields.CharField', [], {'max_length': '2', 'db_index': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'iso_code': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '2', 'db_index': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '50', 'db_index': 'True'})
+        },
+        'rsr.focusarea': {
+            'Meta': {'ordering': "['name']", 'object_name': 'FocusArea'},
+            'description': ('django.db.models.fields.TextField', [], {'max_length': '500'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100'}),
+            'link_to': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}),
+            'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50'})
+        },
+        'rsr.goal': {
+            'Meta': {'object_name': 'Goal'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'project': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'goals'", 'to': "orm['rsr.Project']"}),
+            'text': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'})
+        },
+        'rsr.internalorganisationid': {
+            'Meta': {'unique_together': "(('recording_org', 'referenced_org'),)", 'object_name': 'InternalOrganisationID'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'identifier': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
+            'recording_org': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'internal_ids'", 'to': "orm['rsr.Organisation']"}),
+            'referenced_org': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'reference_ids'", 'to': "orm['rsr.Organisation']"})
+        },
+        'rsr.invoice': {
+            'Meta': {'ordering': "['-id']", 'object_name': 'Invoice'},
+            'amount': ('django.db.models.fields.PositiveIntegerField', [], {}),
+            'amount_received': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '10', 'decimal_places': '2', 'blank': 'True'}),
+            'bank': ('django.db.models.fields.CharField', [], {'max_length': '4', 'blank': 'True'}),
+            'campaign_code': ('django.db.models.fields.CharField', [], {'max_length': '15', 'blank': 'True'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
+            'engine': ('django.db.models.fields.CharField', [], {'default': "'paypal'", 'max_length': '10'}),
+            'http_referer': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'ipn': ('django.db.models.fields.CharField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
+            'is_anonymous': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
+            'project': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'invoices'", 'to': "orm['rsr.Project']"}),
+            'status': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '1'}),
+            'test': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'time': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'transaction_id': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'})
+        },
+        'rsr.link': {
+            'Meta': {'object_name': 'Link'},
+            'caption': ('django.db.models.fields.CharField', [], {'max_length': '50'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'kind': ('django.db.models.fields.CharField', [], {'max_length': '1'}),
+            'project': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'links'", 'to': "orm['rsr.Project']"}),
+            'url': ('django.db.models.fields.URLField', [], {'max_length': '200'})
+        },
+        'rsr.minicms': {
+            'Meta': {'ordering': "['-active', '-id']", 'object_name': 'MiniCMS'},
+            'active': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'feature_box': ('django.db.models.fields.TextField', [], {'max_length': '350'}),
+            'feature_image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'label': ('django.db.models.fields.CharField', [], {'max_length': '50'}),
+            'lower_height': ('django.db.models.fields.IntegerField', [], {'default': '500'}),
+            'top_right_box': ('django.db.models.fields.TextField', [], {'max_length': '350'})
+        },
+        'rsr.molliegateway': {
+            'Meta': {'object_name': 'MollieGateway'},
+            'currency': ('django.db.models.fields.CharField', [], {'default': "'EUR'", 'max_length': '3'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'notification_email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
+            'partner_id': ('django.db.models.fields.CharField', [], {'max_length': '10'})
+        },
+        'rsr.organisation': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Organisation'},
+            'contact_email': ('django.db.models.fields.CharField', [], {'max_length': '50', 'blank': 'True'}),
+            'contact_person': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'fax': ('django.db.models.fields.CharField', [], {'max_length': '20', 'blank': 'True'}),
+            'iati_org_id': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '75', 'unique': 'True', 'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'internal_org_ids': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'recording_organisation'", 'symmetrical': 'False', 'through': "orm['rsr.InternalOrganisationID']", 'to': "orm['rsr.Organisation']"}),
+            'language': ('django.db.models.fields.CharField', [], {'default': "'en'", 'max_length': '2'}),
+            'logo': ('django.db.models.fields.files.ImageField', [], {'max_length': '100', 'blank': 'True'}),
+            'long_name': ('django.db.models.fields.CharField', [], {'max_length': '75', 'blank': 'True'}),
+            'mobile': ('django.db.models.fields.CharField', [], {'max_length': '20', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '25', 'db_index': 'True'}),
+            'new_organisation_type': ('django.db.models.fields.IntegerField', [], {'default': '22', 'db_index': 'True'}),
+            'organisation_type': ('django.db.models.fields.CharField', [], {'max_length': '1', 'db_index': 'True'}),
+            'phone': ('django.db.models.fields.CharField', [], {'max_length': '20', 'blank': 'True'}),
+            'primary_location': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['rsr.OrganisationLocation']", 'null': 'True', 'on_delete': 'models.SET_NULL'}),
+            'url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'})
+        },
+        'rsr.organisationaccount': {
+            'Meta': {'object_name': 'OrganisationAccount'},
+            'account_level': ('django.db.models.fields.CharField', [], {'default': "'free'", 'max_length': '12'}),
+            'organisation': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['rsr.Organisation']", 'unique': 'True', 'primary_key': 'True'})
+        },
+        'rsr.organisationlocation': {
+            'Meta': {'ordering': "['-primary']", 'object_name': 'OrganisationLocation'},
+            'address_1': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'address_2': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'city': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'country': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['rsr.Country']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'latitude': ('akvo.rsr.fields.LatitudeField', [], {'default': '0', 'db_index': 'True'}),
+            'location_target': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'locations'", 'null': 'True', 'to': "orm['rsr.Organisation']"}),
+            'longitude': ('akvo.rsr.fields.LongitudeField', [], {'default': '0', 'db_index': 'True'}),
+            'postcode': ('django.db.models.fields.CharField', [], {'max_length': '10', 'blank': 'True'}),
+            'primary': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'db_index': 'True'}),
+            'state': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'})
+        },
+        'rsr.partnership': {
+            'Meta': {'ordering': "['partner_type']", 'object_name': 'Partnership'},
+            'funding_amount': ('django.db.models.fields.DecimalField', [], {'db_index': 'True', 'null': 'True', 'max_digits': '10', 'decimal_places': '2', 'blank': 'True'}),
+            'iati_activity_id': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '75', 'null': 'True', 'blank': 'True'}),
+            'iati_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'internal_id': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '75', 'null': 'True', 'blank': 'True'}),
+            'organisation': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'partnerships'", 'to': "orm['rsr.Organisation']"}),
+            'partner_type': ('django.db.models.fields.CharField', [], {'max_length': '8', 'db_index': 'True'}),
+            'partner_type_extra': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}),
+            'project': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'partnerships'", 'to': "orm['rsr.Project']"})
+        },
+        'rsr.partnersite': {
+            'Meta': {'ordering': "('organisation__name',)", 'object_name': 'PartnerSite'},
+            'about_box': ('django.db.models.fields.TextField', [], {'max_length': '500', 'blank': 'True'}),
+            'about_image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100', 'blank': 'True'}),
+            'cname': ('akvo.rsr.fields.NullCharField', [], {'max_length': '100', 'unique': 'True', 'null': 'True', 'blank': 'True'}),
+            'custom_css': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'blank': 'True'}),
+            'custom_favicon': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'blank': 'True'}),
+            'custom_logo': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'blank': 'True'}),
+            'custom_return_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}),
+            'default_language': ('django.db.models.fields.CharField', [], {'default': "'en'", 'max_length': '5'}),
+            'enabled': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'google_translation': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'hostname': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '50'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'notes': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'organisation': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['rsr.Organisation']"}),
+            'ui_translation': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+        },
+        'rsr.paymentgatewayselector': {
+            'Meta': {'object_name': 'PaymentGatewaySelector'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'mollie_gateway': ('django.db.models.fields.related.ForeignKey', [], {'default': '1', 'to': "orm['rsr.MollieGateway']"}),
+            'paypal_gateway': ('django.db.models.fields.related.ForeignKey', [], {'default': '1', 'to': "orm['rsr.PayPalGateway']"}),
+            'project': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['rsr.Project']", 'unique': 'True'})
+        },
+        'rsr.paypalgateway': {
+            'Meta': {'object_name': 'PayPalGateway'},
+            'account_email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
+            'currency': ('django.db.models.fields.CharField', [], {'default': "'EUR'", 'max_length': '3'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'locale': ('django.db.models.fields.CharField', [], {'default': "'US'", 'max_length': '2'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'notification_email': ('django.db.models.fields.EmailField', [], {'max_length': '75'})
+        },
+        'rsr.project': {
+            'Meta': {'ordering': "['-id']", 'object_name': 'Project'},
+            'background': ('akvo.rsr.fields.ProjectLimitedTextField', [], {'blank': 'True'}),
+            'budget': ('django.db.models.fields.DecimalField', [], {'decimal_places': '2', 'default': '0', 'max_digits': '10', 'blank': 'True', 'null': 'True', 'db_index': 'True'}),
+            'categories': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'projects'", 'symmetrical': 'False', 'to': "orm['rsr.Category']"}),
+            'currency': ('django.db.models.fields.CharField', [], {'default': "'EUR'", 'max_length': '3'}),
+            'current_image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100', 'blank': 'True'}),
+            'current_image_caption': ('django.db.models.fields.CharField', [], {'max_length': '50', 'blank': 'True'}),
+            'current_status': ('akvo.rsr.fields.ProjectLimitedTextField', [], {'blank': 'True'}),
+            'date_complete': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'date_request_posted': ('django.db.models.fields.DateField', [], {'default': 'datetime.date.today'}),
+            'funds': ('django.db.models.fields.DecimalField', [], {'decimal_places': '2', 'default': '0', 'max_digits': '10', 'blank': 'True', 'null': 'True', 'db_index': 'True'}),
+            'funds_needed': ('django.db.models.fields.DecimalField', [], {'decimal_places': '2', 'default': '0', 'max_digits': '10', 'blank': 'True', 'null': 'True', 'db_index': 'True'}),
+            'goals_overview': ('akvo.rsr.fields.ProjectLimitedTextField', [], {}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'language': ('django.db.models.fields.CharField', [], {'default': "'en'", 'max_length': '2'}),
+            'notes': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'partners': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'projects'", 'symmetrical': 'False', 'through': "orm['rsr.Partnership']", 'to': "orm['rsr.Organisation']"}),
+            'primary_location': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['rsr.ProjectLocation']", 'null': 'True', 'on_delete': 'models.SET_NULL'}),
+            'project_plan': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'project_plan_summary': ('akvo.rsr.fields.ProjectLimitedTextField', [], {}),
+            'project_rating': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'status': ('django.db.models.fields.CharField', [], {'default': "'N'", 'max_length': '1', 'db_index': 'True'}),
+            'subtitle': ('django.db.models.fields.CharField', [], {'max_length': '75'}),
+            'sustainability': ('django.db.models.fields.TextField', [], {}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '45', 'db_index': 'True'})
+        },
+        'rsr.projectcomment': {
+            'Meta': {'ordering': "('-id',)", 'object_name': 'ProjectComment'},
+            'comment': ('django.db.models.fields.TextField', [], {}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'project': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'comments'", 'to': "orm['rsr.Project']"}),
+            'time': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+        },
+        'rsr.projectlocation': {
+            'Meta': {'ordering': "['-primary']", 'object_name': 'ProjectLocation'},
+            'address_1': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'address_2': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'city': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'country': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['rsr.Country']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'latitude': ('akvo.rsr.fields.LatitudeField', [], {'default': '0', 'db_index': 'True'}),
+            'location_target': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'locations'", 'null': 'True', 'to': "orm['rsr.Project']"}),
+            'longitude': ('akvo.rsr.fields.LongitudeField', [], {'default': '0', 'db_index': 'True'}),
+            'postcode': ('django.db.models.fields.CharField', [], {'max_length': '10', 'blank': 'True'}),
+            'primary': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'db_index': 'True'}),
+            'state': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'})
+        },
+        'rsr.projectupdate': {
+            'Meta': {'ordering': "['-id']", 'object_name': 'ProjectUpdate'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'language': ('django.db.models.fields.CharField', [], {'default': "'en'", 'max_length': '2'}),
+            'photo': ('django.db.models.fields.files.ImageField', [], {'max_length': '100', 'blank': 'True'}),
+            'photo_caption': ('django.db.models.fields.CharField', [], {'max_length': '75', 'blank': 'True'}),
+            'photo_credit': ('django.db.models.fields.CharField', [], {'max_length': '25', 'blank': 'True'}),
+            'photo_location': ('django.db.models.fields.CharField', [], {'max_length': '1'}),
+            'project': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'project_updates'", 'to': "orm['rsr.Project']"}),
+            'text': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'time': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'db_index': 'True', 'blank': 'True'}),
+            'time_last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'db_index': 'True', 'blank': 'True'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '50', 'db_index': 'True'}),
+            'update_method': ('django.db.models.fields.CharField', [], {'default': "'W'", 'max_length': '1', 'db_index': 'True', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}),
+            'video': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}),
+            'video_caption': ('django.db.models.fields.CharField', [], {'max_length': '75', 'blank': 'True'}),
+            'video_credit': ('django.db.models.fields.CharField', [], {'max_length': '25', 'blank': 'True'})
+        },
+        'rsr.publishingstatus': {
+            'Meta': {'ordering': "('-status', 'project')", 'object_name': 'PublishingStatus'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'project': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['rsr.Project']", 'unique': 'True'}),
+            'status': ('django.db.models.fields.CharField', [], {'default': "'unpublished'", 'max_length': '30'})
+        },
+        'rsr.smsreporter': {
+            'Meta': {'unique_together': "(('userprofile', 'gw_number', 'project'),)", 'object_name': 'SmsReporter'},
+            'gw_number': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['gateway.GatewayNumber']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'project': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['rsr.Project']", 'null': 'True', 'blank': 'True'}),
+            'userprofile': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'reporters'", 'to': "orm['rsr.UserProfile']"})
+        },
+        'rsr.userprofile': {
+            'Meta': {'ordering': "['user__username']", 'object_name': 'UserProfile'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'organisation': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['rsr.Organisation']"}),
+            'phone_number': ('django.db.models.fields.CharField', [], {'max_length': '50', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'}),
+            'validation': ('django.db.models.fields.CharField', [], {'max_length': '20', 'blank': 'True'})
+        }
+    }
+
+    complete_apps = ['rsr']
\ No newline at end of file
diff --git a/akvo/rsr/migrations/0037_auto__add_partnertype.py b/akvo/rsr/migrations/0037_auto__add_partnertype.py
new file mode 100644
index 0000000000..3f8db505d3
--- /dev/null
+++ b/akvo/rsr/migrations/0037_auto__add_partnertype.py
@@ -0,0 +1,384 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Adding model 'PartnerType'
+        db.create_table('rsr_partnertype', (
+            ('id', self.gf('django.db.models.fields.CharField')(unique=True, max_length=8, primary_key=True)),
+            ('label', self.gf('django.db.models.fields.CharField')(unique=True, max_length=30)),
+        ))
+        db.send_create_signal('rsr', ['PartnerType'])
+
+        # Adding M2M table for field partner_types on 'Organisation'
+        db.create_table('rsr_organisation_partner_types', (
+            ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)),
+            ('organisation', models.ForeignKey(orm['rsr.organisation'], null=False)),
+            ('partnertype', models.ForeignKey(orm['rsr.partnertype'], null=False))
+        ))
+        db.create_unique('rsr_organisation_partner_types', ['organisation_id', 'partnertype_id'])
+
+
+    def backwards(self, orm):
+        # Deleting model 'PartnerType'
+        db.delete_table('rsr_partnertype')
+
+        # Removing M2M table for field partner_types on 'Organisation'
+        db.delete_table('rsr_organisation_partner_types')
+
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'gateway.gateway': {
+            'Meta': {'object_name': 'Gateway'},
+            'host_name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'message': ('django.db.models.fields.CharField', [], {'max_length': '30'}),
+            'msg_id': ('django.db.models.fields.CharField', [], {'max_length': '30'}),
+            'name': ('django.db.models.fields.SlugField', [], {'max_length': '30'}),
+            'receiver': ('django.db.models.fields.CharField', [], {'max_length': '30'}),
+            'send_path': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'sender': ('django.db.models.fields.CharField', [], {'max_length': '30'}),
+            'timestamp': ('django.db.models.fields.CharField', [], {'max_length': '30'})
+        },
+        'gateway.gatewaynumber': {
+            'Meta': {'object_name': 'GatewayNumber'},
+            'gateway': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['gateway.Gateway']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'number': ('django.db.models.fields.CharField', [], {'max_length': '30'})
+        },
+        'rsr.benchmark': {
+            'Meta': {'ordering': "('category__name', 'name__order')", 'object_name': 'Benchmark'},
+            'category': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['rsr.Category']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['rsr.Benchmarkname']"}),
+            'project': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "u'benchmarks'", 'to': "orm['rsr.Project']"}),
+            'value': ('django.db.models.fields.IntegerField', [], {})
+        },
+        'rsr.benchmarkname': {
+            'Meta': {'ordering': "['order', 'name']", 'object_name': 'Benchmarkname'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '80'}),
+            'order': ('django.db.models.fields.IntegerField', [], {'default': '0'})
+        },
+        'rsr.budgetitem': {
+            'Meta': {'ordering': "('label',)", 'unique_together': "(('project', 'label'),)", 'object_name': 'BudgetItem'},
+            'amount': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '2'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'label': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['rsr.BudgetItemLabel']"}),
+            'other_extra': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),
+            'project': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'budget_items'", 'to': "orm['rsr.Project']"})
+        },
+        'rsr.budgetitemlabel': {
+            'Meta': {'ordering': "('label',)", 'object_name': 'BudgetItemLabel'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '20', 'db_index': 'True'})
+        },
+        'rsr.category': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Category'},
+            'benchmarknames': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['rsr.Benchmarkname']", 'symmetrical': 'False', 'blank': 'True'}),
+            'focus_area': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'categories'", 'symmetrical': 'False', 'to': "orm['rsr.FocusArea']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50', 'db_index': 'True'})
+        },
+        'rsr.country': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Country'},
+            'continent': ('django.db.models.fields.CharField', [], {'max_length': '20', 'db_index': 'True'}),
+            'continent_code': ('django.db.models.fields.CharField', [], {'max_length': '2', 'db_index': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'iso_code': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '2', 'db_index': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '50', 'db_index': 'True'})
+        },
+        'rsr.focusarea': {
+            'Meta': {'ordering': "['name']", 'object_name': 'FocusArea'},
+            'description': ('django.db.models.fields.TextField', [], {'max_length': '500'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100'}),
+            'link_to': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}),
+            'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50'})
+        },
+        'rsr.goal': {
+            'Meta': {'object_name': 'Goal'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'project': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'goals'", 'to': "orm['rsr.Project']"}),
+            'text': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'})
+        },
+        'rsr.internalorganisationid': {
+            'Meta': {'unique_together': "(('recording_org', 'referenced_org'),)", 'object_name': 'InternalOrganisationID'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'identifier': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
+            'recording_org': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'internal_ids'", 'to': "orm['rsr.Organisation']"}),
+            'referenced_org': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'reference_ids'", 'to': "orm['rsr.Organisation']"})
+        },
+        'rsr.invoice': {
+            'Meta': {'ordering': "['-id']", 'object_name': 'Invoice'},
+            'amount': ('django.db.models.fields.PositiveIntegerField', [], {}),
+            'amount_received': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '10', 'decimal_places': '2', 'blank': 'True'}),
+            'bank': ('django.db.models.fields.CharField', [], {'max_length': '4', 'blank': 'True'}),
+            'campaign_code': ('django.db.models.fields.CharField', [], {'max_length': '15', 'blank': 'True'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
+            'engine': ('django.db.models.fields.CharField', [], {'default': "'paypal'", 'max_length': '10'}),
+            'http_referer': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'ipn': ('django.db.models.fields.CharField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
+            'is_anonymous': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
+            'project': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'invoices'", 'to': "orm['rsr.Project']"}),
+            'status': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '1'}),
+            'test': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'time': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'transaction_id': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'})
+        },
+        'rsr.link': {
+            'Meta': {'object_name': 'Link'},
+            'caption': ('django.db.models.fields.CharField', [], {'max_length': '50'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'kind': ('django.db.models.fields.CharField', [], {'max_length': '1'}),
+            'project': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'links'", 'to': "orm['rsr.Project']"}),
+            'url': ('django.db.models.fields.URLField', [], {'max_length': '200'})
+        },
+        'rsr.minicms': {
+            'Meta': {'ordering': "['-active', '-id']", 'object_name': 'MiniCMS'},
+            'active': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'feature_box': ('django.db.models.fields.TextField', [], {'max_length': '350'}),
+            'feature_image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'label': ('django.db.models.fields.CharField', [], {'max_length': '50'}),
+            'lower_height': ('django.db.models.fields.IntegerField', [], {'default': '500'}),
+            'top_right_box': ('django.db.models.fields.TextField', [], {'max_length': '350'})
+        },
+        'rsr.molliegateway': {
+            'Meta': {'object_name': 'MollieGateway'},
+            'currency': ('django.db.models.fields.CharField', [], {'default': "'EUR'", 'max_length': '3'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'notification_email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
+            'partner_id': ('django.db.models.fields.CharField', [], {'max_length': '10'})
+        },
+        'rsr.organisation': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Organisation'},
+            'contact_email': ('django.db.models.fields.CharField', [], {'max_length': '50', 'blank': 'True'}),
+            'contact_person': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'fax': ('django.db.models.fields.CharField', [], {'max_length': '20', 'blank': 'True'}),
+            'iati_org_id': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '75', 'unique': 'True', 'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'internal_org_ids': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'recording_organisation'", 'symmetrical': 'False', 'through': "orm['rsr.InternalOrganisationID']", 'to': "orm['rsr.Organisation']"}),
+            'language': ('django.db.models.fields.CharField', [], {'default': "'en'", 'max_length': '2'}),
+            'logo': ('django.db.models.fields.files.ImageField', [], {'max_length': '100', 'blank': 'True'}),
+            'long_name': ('django.db.models.fields.CharField', [], {'max_length': '75', 'blank': 'True'}),
+            'mobile': ('django.db.models.fields.CharField', [], {'max_length': '20', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '25', 'db_index': 'True'}),
+            'new_organisation_type': ('django.db.models.fields.IntegerField', [], {'default': '22', 'db_index': 'True'}),
+            'organisation_type': ('django.db.models.fields.CharField', [], {'max_length': '1', 'db_index': 'True'}),
+            'partner_types': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['rsr.PartnerType']", 'symmetrical': 'False'}),
+            'phone': ('django.db.models.fields.CharField', [], {'max_length': '20', 'blank': 'True'}),
+            'primary_location': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['rsr.OrganisationLocation']", 'null': 'True', 'on_delete': 'models.SET_NULL'}),
+            'url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'})
+        },
+        'rsr.organisationaccount': {
+            'Meta': {'object_name': 'OrganisationAccount'},
+            'account_level': ('django.db.models.fields.CharField', [], {'default': "'free'", 'max_length': '12'}),
+            'organisation': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['rsr.Organisation']", 'unique': 'True', 'primary_key': 'True'})
+        },
+        'rsr.organisationlocation': {
+            'Meta': {'ordering': "['-primary']", 'object_name': 'OrganisationLocation'},
+            'address_1': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'address_2': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'city': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'country': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['rsr.Country']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'latitude': ('akvo.rsr.fields.LatitudeField', [], {'default': '0', 'db_index': 'True'}),
+            'location_target': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'locations'", 'null': 'True', 'to': "orm['rsr.Organisation']"}),
+            'longitude': ('akvo.rsr.fields.LongitudeField', [], {'default': '0', 'db_index': 'True'}),
+            'postcode': ('django.db.models.fields.CharField', [], {'max_length': '10', 'blank': 'True'}),
+            'primary': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'db_index': 'True'}),
+            'state': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'})
+        },
+        'rsr.partnership': {
+            'Meta': {'ordering': "['partner_type']", 'object_name': 'Partnership'},
+            'funding_amount': ('django.db.models.fields.DecimalField', [], {'db_index': 'True', 'null': 'True', 'max_digits': '10', 'decimal_places': '2', 'blank': 'True'}),
+            'iati_activity_id': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '75', 'null': 'True', 'blank': 'True'}),
+            'iati_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'internal_id': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '75', 'null': 'True', 'blank': 'True'}),
+            'organisation': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'partnerships'", 'to': "orm['rsr.Organisation']"}),
+            'partner_type': ('django.db.models.fields.CharField', [], {'max_length': '8', 'db_index': 'True'}),
+            'partner_type_extra': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}),
+            'project': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'partnerships'", 'to': "orm['rsr.Project']"})
+        },
+        'rsr.partnersite': {
+            'Meta': {'ordering': "('organisation__name',)", 'object_name': 'PartnerSite'},
+            'about_box': ('django.db.models.fields.TextField', [], {'max_length': '500', 'blank': 'True'}),
+            'about_image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100', 'blank': 'True'}),
+            'cname': ('akvo.rsr.fields.NullCharField', [], {'max_length': '100', 'unique': 'True', 'null': 'True', 'blank': 'True'}),
+            'custom_css': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'blank': 'True'}),
+            'custom_favicon': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'blank': 'True'}),
+            'custom_logo': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'blank': 'True'}),
+            'custom_return_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}),
+            'default_language': ('django.db.models.fields.CharField', [], {'default': "'en'", 'max_length': '5'}),
+            'enabled': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'google_translation': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'hostname': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '50'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'notes': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'organisation': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['rsr.Organisation']"}),
+            'ui_translation': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+        },
+        'rsr.partnertype': {
+            'Meta': {'ordering': "('label',)", 'object_name': 'PartnerType'},
+            'id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '8', 'primary_key': 'True'}),
+            'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'rsr.paymentgatewayselector': {
+            'Meta': {'object_name': 'PaymentGatewaySelector'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'mollie_gateway': ('django.db.models.fields.related.ForeignKey', [], {'default': '1', 'to': "orm['rsr.MollieGateway']"}),
+            'paypal_gateway': ('django.db.models.fields.related.ForeignKey', [], {'default': '1', 'to': "orm['rsr.PayPalGateway']"}),
+            'project': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['rsr.Project']", 'unique': 'True'})
+        },
+        'rsr.paypalgateway': {
+            'Meta': {'object_name': 'PayPalGateway'},
+            'account_email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
+            'currency': ('django.db.models.fields.CharField', [], {'default': "'EUR'", 'max_length': '3'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'locale': ('django.db.models.fields.CharField', [], {'default': "'US'", 'max_length': '2'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'notification_email': ('django.db.models.fields.EmailField', [], {'max_length': '75'})
+        },
+        'rsr.project': {
+            'Meta': {'ordering': "['-id']", 'object_name': 'Project'},
+            'background': ('akvo.rsr.fields.ProjectLimitedTextField', [], {'blank': 'True'}),
+            'budget': ('django.db.models.fields.DecimalField', [], {'decimal_places': '2', 'default': '0', 'max_digits': '10', 'blank': 'True', 'null': 'True', 'db_index': 'True'}),
+            'categories': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'projects'", 'symmetrical': 'False', 'to': "orm['rsr.Category']"}),
+            'currency': ('django.db.models.fields.CharField', [], {'default': "'EUR'", 'max_length': '3'}),
+            'current_image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100', 'blank': 'True'}),
+            'current_image_caption': ('django.db.models.fields.CharField', [], {'max_length': '50', 'blank': 'True'}),
+            'current_status': ('akvo.rsr.fields.ProjectLimitedTextField', [], {'blank': 'True'}),
+            'date_complete': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'date_request_posted': ('django.db.models.fields.DateField', [], {'default': 'datetime.date.today'}),
+            'funds': ('django.db.models.fields.DecimalField', [], {'decimal_places': '2', 'default': '0', 'max_digits': '10', 'blank': 'True', 'null': 'True', 'db_index': 'True'}),
+            'funds_needed': ('django.db.models.fields.DecimalField', [], {'decimal_places': '2', 'default': '0', 'max_digits': '10', 'blank': 'True', 'null': 'True', 'db_index': 'True'}),
+            'goals_overview': ('akvo.rsr.fields.ProjectLimitedTextField', [], {}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'language': ('django.db.models.fields.CharField', [], {'default': "'en'", 'max_length': '2'}),
+            'notes': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'partners': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'projects'", 'symmetrical': 'False', 'through': "orm['rsr.Partnership']", 'to': "orm['rsr.Organisation']"}),
+            'primary_location': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['rsr.ProjectLocation']", 'null': 'True', 'on_delete': 'models.SET_NULL'}),
+            'project_plan': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'project_plan_summary': ('akvo.rsr.fields.ProjectLimitedTextField', [], {}),
+            'project_rating': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'status': ('django.db.models.fields.CharField', [], {'default': "'N'", 'max_length': '1', 'db_index': 'True'}),
+            'subtitle': ('django.db.models.fields.CharField', [], {'max_length': '75'}),
+            'sustainability': ('django.db.models.fields.TextField', [], {}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '45', 'db_index': 'True'})
+        },
+        'rsr.projectcomment': {
+            'Meta': {'ordering': "('-id',)", 'object_name': 'ProjectComment'},
+            'comment': ('django.db.models.fields.TextField', [], {}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'project': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'comments'", 'to': "orm['rsr.Project']"}),
+            'time': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+        },
+        'rsr.projectlocation': {
+            'Meta': {'ordering': "['-primary']", 'object_name': 'ProjectLocation'},
+            'address_1': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'address_2': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'city': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'country': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['rsr.Country']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'latitude': ('akvo.rsr.fields.LatitudeField', [], {'default': '0', 'db_index': 'True'}),
+            'location_target': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'locations'", 'null': 'True', 'to': "orm['rsr.Project']"}),
+            'longitude': ('akvo.rsr.fields.LongitudeField', [], {'default': '0', 'db_index': 'True'}),
+            'postcode': ('django.db.models.fields.CharField', [], {'max_length': '10', 'blank': 'True'}),
+            'primary': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'db_index': 'True'}),
+            'state': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'})
+        },
+        'rsr.projectupdate': {
+            'Meta': {'ordering': "['-id']", 'object_name': 'ProjectUpdate'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'language': ('django.db.models.fields.CharField', [], {'default': "'en'", 'max_length': '2'}),
+            'photo': ('django.db.models.fields.files.ImageField', [], {'max_length': '100', 'blank': 'True'}),
+            'photo_caption': ('django.db.models.fields.CharField', [], {'max_length': '75', 'blank': 'True'}),
+            'photo_credit': ('django.db.models.fields.CharField', [], {'max_length': '25', 'blank': 'True'}),
+            'photo_location': ('django.db.models.fields.CharField', [], {'max_length': '1'}),
+            'project': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'project_updates'", 'to': "orm['rsr.Project']"}),
+            'text': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'time': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'db_index': 'True', 'blank': 'True'}),
+            'time_last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'db_index': 'True', 'blank': 'True'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '50', 'db_index': 'True'}),
+            'update_method': ('django.db.models.fields.CharField', [], {'default': "'W'", 'max_length': '1', 'db_index': 'True', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}),
+            'video': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}),
+            'video_caption': ('django.db.models.fields.CharField', [], {'max_length': '75', 'blank': 'True'}),
+            'video_credit': ('django.db.models.fields.CharField', [], {'max_length': '25', 'blank': 'True'})
+        },
+        'rsr.publishingstatus': {
+            'Meta': {'ordering': "('-status', 'project')", 'object_name': 'PublishingStatus'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'project': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['rsr.Project']", 'unique': 'True'}),
+            'status': ('django.db.models.fields.CharField', [], {'default': "'unpublished'", 'max_length': '30'})
+        },
+        'rsr.smsreporter': {
+            'Meta': {'unique_together': "(('userprofile', 'gw_number', 'project'),)", 'object_name': 'SmsReporter'},
+            'gw_number': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['gateway.GatewayNumber']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'project': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['rsr.Project']", 'null': 'True', 'blank': 'True'}),
+            'userprofile': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'reporters'", 'to': "orm['rsr.UserProfile']"})
+        },
+        'rsr.userprofile': {
+            'Meta': {'ordering': "['user__username']", 'object_name': 'UserProfile'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'organisation': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['rsr.Organisation']"}),
+            'phone_number': ('django.db.models.fields.CharField', [], {'max_length': '50', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'}),
+            'validation': ('django.db.models.fields.CharField', [], {'max_length': '20', 'blank': 'True'})
+        }
+    }
+
+    complete_apps = ['rsr']
\ No newline at end of file
diff --git a/akvo/rsr/migrations/0038_limit_org_partner_types.py b/akvo/rsr/migrations/0038_limit_org_partner_types.py
new file mode 100644
index 0000000000..dac8bf15d3
--- /dev/null
+++ b/akvo/rsr/migrations/0038_limit_org_partner_types.py
@@ -0,0 +1,380 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import DataMigration
+from django.db import models
+
+class Migration(DataMigration):
+
+    def forwards(self, orm):
+        # create a dict with organisations as keys and a set of their partner types as values
+        organisations = {}
+        for partnership in orm['rsr.Partnership'].objects.all():
+            organisation = partnership.organisation
+            partner_type = partnership.partner_type
+            partner_types_for_org = organisations.setdefault(organisation, {partner_type})
+            partner_types_for_org.add(partner_type)
+        partner_types = orm['rsr.PartnerType'].objects.all()
+        partner_types_dict = {partner_type.id: partner_type for partner_type in partner_types}
+        for organisation, allowed_partner_types in organisations.items():
+            organisation.partner_types.add(
+                *[partner_types_dict[id] for id in list(allowed_partner_types)]
+            )
+            print u"Organisation {org_name} partner types: {allowed_partner_types}".format(
+                org_name=organisation.name, allowed_partner_types=', '.join(list(allowed_partner_types))
+            )
+
+    def backwards(self, orm):
+        "Write your backwards methods here."
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'gateway.gateway': {
+            'Meta': {'object_name': 'Gateway'},
+            'host_name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'message': ('django.db.models.fields.CharField', [], {'max_length': '30'}),
+            'msg_id': ('django.db.models.fields.CharField', [], {'max_length': '30'}),
+            'name': ('django.db.models.fields.SlugField', [], {'max_length': '30'}),
+            'receiver': ('django.db.models.fields.CharField', [], {'max_length': '30'}),
+            'send_path': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'sender': ('django.db.models.fields.CharField', [], {'max_length': '30'}),
+            'timestamp': ('django.db.models.fields.CharField', [], {'max_length': '30'})
+        },
+        'gateway.gatewaynumber': {
+            'Meta': {'object_name': 'GatewayNumber'},
+            'gateway': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['gateway.Gateway']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'number': ('django.db.models.fields.CharField', [], {'max_length': '30'})
+        },
+        'rsr.benchmark': {
+            'Meta': {'ordering': "('category__name', 'name__order')", 'object_name': 'Benchmark'},
+            'category': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['rsr.Category']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['rsr.Benchmarkname']"}),
+            'project': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "u'benchmarks'", 'to': "orm['rsr.Project']"}),
+            'value': ('django.db.models.fields.IntegerField', [], {})
+        },
+        'rsr.benchmarkname': {
+            'Meta': {'ordering': "['order', 'name']", 'object_name': 'Benchmarkname'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '80'}),
+            'order': ('django.db.models.fields.IntegerField', [], {'default': '0'})
+        },
+        'rsr.budgetitem': {
+            'Meta': {'ordering': "('label',)", 'unique_together': "(('project', 'label'),)", 'object_name': 'BudgetItem'},
+            'amount': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '2'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'label': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['rsr.BudgetItemLabel']"}),
+            'other_extra': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),
+            'project': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'budget_items'", 'to': "orm['rsr.Project']"})
+        },
+        'rsr.budgetitemlabel': {
+            'Meta': {'ordering': "('label',)", 'object_name': 'BudgetItemLabel'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '20', 'db_index': 'True'})
+        },
+        'rsr.category': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Category'},
+            'benchmarknames': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['rsr.Benchmarkname']", 'symmetrical': 'False', 'blank': 'True'}),
+            'focus_area': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'categories'", 'symmetrical': 'False', 'to': "orm['rsr.FocusArea']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50', 'db_index': 'True'})
+        },
+        'rsr.country': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Country'},
+            'continent': ('django.db.models.fields.CharField', [], {'max_length': '20', 'db_index': 'True'}),
+            'continent_code': ('django.db.models.fields.CharField', [], {'max_length': '2', 'db_index': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'iso_code': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '2', 'db_index': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '50', 'db_index': 'True'})
+        },
+        'rsr.focusarea': {
+            'Meta': {'ordering': "['name']", 'object_name': 'FocusArea'},
+            'description': ('django.db.models.fields.TextField', [], {'max_length': '500'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100'}),
+            'link_to': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}),
+            'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50'})
+        },
+        'rsr.goal': {
+            'Meta': {'object_name': 'Goal'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'project': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'goals'", 'to': "orm['rsr.Project']"}),
+            'text': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'})
+        },
+        'rsr.internalorganisationid': {
+            'Meta': {'unique_together': "(('recording_org', 'referenced_org'),)", 'object_name': 'InternalOrganisationID'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'identifier': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
+            'recording_org': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'internal_ids'", 'to': "orm['rsr.Organisation']"}),
+            'referenced_org': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'reference_ids'", 'to': "orm['rsr.Organisation']"})
+        },
+        'rsr.invoice': {
+            'Meta': {'ordering': "['-id']", 'object_name': 'Invoice'},
+            'amount': ('django.db.models.fields.PositiveIntegerField', [], {}),
+            'amount_received': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '10', 'decimal_places': '2', 'blank': 'True'}),
+            'bank': ('django.db.models.fields.CharField', [], {'max_length': '4', 'blank': 'True'}),
+            'campaign_code': ('django.db.models.fields.CharField', [], {'max_length': '15', 'blank': 'True'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
+            'engine': ('django.db.models.fields.CharField', [], {'default': "'paypal'", 'max_length': '10'}),
+            'http_referer': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'ipn': ('django.db.models.fields.CharField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
+            'is_anonymous': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
+            'project': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'invoices'", 'to': "orm['rsr.Project']"}),
+            'status': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '1'}),
+            'test': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'time': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'transaction_id': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'})
+        },
+        'rsr.link': {
+            'Meta': {'object_name': 'Link'},
+            'caption': ('django.db.models.fields.CharField', [], {'max_length': '50'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'kind': ('django.db.models.fields.CharField', [], {'max_length': '1'}),
+            'project': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'links'", 'to': "orm['rsr.Project']"}),
+            'url': ('django.db.models.fields.URLField', [], {'max_length': '200'})
+        },
+        'rsr.minicms': {
+            'Meta': {'ordering': "['-active', '-id']", 'object_name': 'MiniCMS'},
+            'active': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'feature_box': ('django.db.models.fields.TextField', [], {'max_length': '350'}),
+            'feature_image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'label': ('django.db.models.fields.CharField', [], {'max_length': '50'}),
+            'lower_height': ('django.db.models.fields.IntegerField', [], {'default': '500'}),
+            'top_right_box': ('django.db.models.fields.TextField', [], {'max_length': '350'})
+        },
+        'rsr.molliegateway': {
+            'Meta': {'object_name': 'MollieGateway'},
+            'currency': ('django.db.models.fields.CharField', [], {'default': "'EUR'", 'max_length': '3'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'notification_email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
+            'partner_id': ('django.db.models.fields.CharField', [], {'max_length': '10'})
+        },
+        'rsr.organisation': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Organisation'},
+            'contact_email': ('django.db.models.fields.CharField', [], {'max_length': '50', 'blank': 'True'}),
+            'contact_person': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'fax': ('django.db.models.fields.CharField', [], {'max_length': '20', 'blank': 'True'}),
+            'iati_org_id': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '75', 'unique': 'True', 'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'internal_org_ids': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'recording_organisation'", 'symmetrical': 'False', 'through': "orm['rsr.InternalOrganisationID']", 'to': "orm['rsr.Organisation']"}),
+            'language': ('django.db.models.fields.CharField', [], {'default': "'en'", 'max_length': '2'}),
+            'logo': ('django.db.models.fields.files.ImageField', [], {'max_length': '100', 'blank': 'True'}),
+            'long_name': ('django.db.models.fields.CharField', [], {'max_length': '75', 'blank': 'True'}),
+            'mobile': ('django.db.models.fields.CharField', [], {'max_length': '20', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '25', 'db_index': 'True'}),
+            'new_organisation_type': ('django.db.models.fields.IntegerField', [], {'default': '22', 'db_index': 'True'}),
+            'organisation_type': ('django.db.models.fields.CharField', [], {'max_length': '1', 'db_index': 'True'}),
+            'partner_types': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['rsr.PartnerType']", 'symmetrical': 'False'}),
+            'phone': ('django.db.models.fields.CharField', [], {'max_length': '20', 'blank': 'True'}),
+            'primary_location': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['rsr.OrganisationLocation']", 'null': 'True', 'on_delete': 'models.SET_NULL'}),
+            'url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'})
+        },
+        'rsr.organisationaccount': {
+            'Meta': {'object_name': 'OrganisationAccount'},
+            'account_level': ('django.db.models.fields.CharField', [], {'default': "'free'", 'max_length': '12'}),
+            'organisation': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['rsr.Organisation']", 'unique': 'True', 'primary_key': 'True'})
+        },
+        'rsr.organisationlocation': {
+            'Meta': {'ordering': "['-primary']", 'object_name': 'OrganisationLocation'},
+            'address_1': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'address_2': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'city': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'country': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['rsr.Country']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'latitude': ('akvo.rsr.fields.LatitudeField', [], {'default': '0', 'db_index': 'True'}),
+            'location_target': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'locations'", 'null': 'True', 'to': "orm['rsr.Organisation']"}),
+            'longitude': ('akvo.rsr.fields.LongitudeField', [], {'default': '0', 'db_index': 'True'}),
+            'postcode': ('django.db.models.fields.CharField', [], {'max_length': '10', 'blank': 'True'}),
+            'primary': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'db_index': 'True'}),
+            'state': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'})
+        },
+        'rsr.partnership': {
+            'Meta': {'ordering': "['partner_type']", 'object_name': 'Partnership'},
+            'funding_amount': ('django.db.models.fields.DecimalField', [], {'db_index': 'True', 'null': 'True', 'max_digits': '10', 'decimal_places': '2', 'blank': 'True'}),
+            'iati_activity_id': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '75', 'null': 'True', 'blank': 'True'}),
+            'iati_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'internal_id': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '75', 'null': 'True', 'blank': 'True'}),
+            'organisation': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'partnerships'", 'to': "orm['rsr.Organisation']"}),
+            'partner_type': ('django.db.models.fields.CharField', [], {'max_length': '8', 'db_index': 'True'}),
+            'partner_type_extra': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}),
+            'project': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'partnerships'", 'to': "orm['rsr.Project']"})
+        },
+        'rsr.partnersite': {
+            'Meta': {'ordering': "('organisation__name',)", 'object_name': 'PartnerSite'},
+            'about_box': ('django.db.models.fields.TextField', [], {'max_length': '500', 'blank': 'True'}),
+            'about_image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100', 'blank': 'True'}),
+            'cname': ('akvo.rsr.fields.NullCharField', [], {'max_length': '100', 'unique': 'True', 'null': 'True', 'blank': 'True'}),
+            'custom_css': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'blank': 'True'}),
+            'custom_favicon': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'blank': 'True'}),
+            'custom_logo': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'blank': 'True'}),
+            'custom_return_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}),
+            'default_language': ('django.db.models.fields.CharField', [], {'default': "'en'", 'max_length': '5'}),
+            'enabled': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'google_translation': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'hostname': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '50'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'notes': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'organisation': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['rsr.Organisation']"}),
+            'ui_translation': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+        },
+        'rsr.partnertype': {
+            'Meta': {'ordering': "('label',)", 'object_name': 'PartnerType'},
+            'id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '8', 'primary_key': 'True'}),
+            'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'rsr.paymentgatewayselector': {
+            'Meta': {'object_name': 'PaymentGatewaySelector'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'mollie_gateway': ('django.db.models.fields.related.ForeignKey', [], {'default': '1', 'to': "orm['rsr.MollieGateway']"}),
+            'paypal_gateway': ('django.db.models.fields.related.ForeignKey', [], {'default': '1', 'to': "orm['rsr.PayPalGateway']"}),
+            'project': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['rsr.Project']", 'unique': 'True'})
+        },
+        'rsr.paypalgateway': {
+            'Meta': {'object_name': 'PayPalGateway'},
+            'account_email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
+            'currency': ('django.db.models.fields.CharField', [], {'default': "'EUR'", 'max_length': '3'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'locale': ('django.db.models.fields.CharField', [], {'default': "'US'", 'max_length': '2'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'notification_email': ('django.db.models.fields.EmailField', [], {'max_length': '75'})
+        },
+        'rsr.project': {
+            'Meta': {'ordering': "['-id']", 'object_name': 'Project'},
+            'background': ('akvo.rsr.fields.ProjectLimitedTextField', [], {'blank': 'True'}),
+            'budget': ('django.db.models.fields.DecimalField', [], {'decimal_places': '2', 'default': '0', 'max_digits': '10', 'blank': 'True', 'null': 'True', 'db_index': 'True'}),
+            'categories': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'projects'", 'symmetrical': 'False', 'to': "orm['rsr.Category']"}),
+            'currency': ('django.db.models.fields.CharField', [], {'default': "'EUR'", 'max_length': '3'}),
+            'current_image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100', 'blank': 'True'}),
+            'current_image_caption': ('django.db.models.fields.CharField', [], {'max_length': '50', 'blank': 'True'}),
+            'current_status': ('akvo.rsr.fields.ProjectLimitedTextField', [], {'blank': 'True'}),
+            'date_complete': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'date_request_posted': ('django.db.models.fields.DateField', [], {'default': 'datetime.date.today'}),
+            'funds': ('django.db.models.fields.DecimalField', [], {'decimal_places': '2', 'default': '0', 'max_digits': '10', 'blank': 'True', 'null': 'True', 'db_index': 'True'}),
+            'funds_needed': ('django.db.models.fields.DecimalField', [], {'decimal_places': '2', 'default': '0', 'max_digits': '10', 'blank': 'True', 'null': 'True', 'db_index': 'True'}),
+            'goals_overview': ('akvo.rsr.fields.ProjectLimitedTextField', [], {}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'language': ('django.db.models.fields.CharField', [], {'default': "'en'", 'max_length': '2'}),
+            'notes': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'partners': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'projects'", 'symmetrical': 'False', 'through': "orm['rsr.Partnership']", 'to': "orm['rsr.Organisation']"}),
+            'primary_location': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['rsr.ProjectLocation']", 'null': 'True', 'on_delete': 'models.SET_NULL'}),
+            'project_plan': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'project_plan_summary': ('akvo.rsr.fields.ProjectLimitedTextField', [], {}),
+            'project_rating': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'status': ('django.db.models.fields.CharField', [], {'default': "'N'", 'max_length': '1', 'db_index': 'True'}),
+            'subtitle': ('django.db.models.fields.CharField', [], {'max_length': '75'}),
+            'sustainability': ('django.db.models.fields.TextField', [], {}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '45', 'db_index': 'True'})
+        },
+        'rsr.projectcomment': {
+            'Meta': {'ordering': "('-id',)", 'object_name': 'ProjectComment'},
+            'comment': ('django.db.models.fields.TextField', [], {}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'project': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'comments'", 'to': "orm['rsr.Project']"}),
+            'time': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+        },
+        'rsr.projectlocation': {
+            'Meta': {'ordering': "['-primary']", 'object_name': 'ProjectLocation'},
+            'address_1': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'address_2': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'city': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'country': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['rsr.Country']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'latitude': ('akvo.rsr.fields.LatitudeField', [], {'default': '0', 'db_index': 'True'}),
+            'location_target': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'locations'", 'null': 'True', 'to': "orm['rsr.Project']"}),
+            'longitude': ('akvo.rsr.fields.LongitudeField', [], {'default': '0', 'db_index': 'True'}),
+            'postcode': ('django.db.models.fields.CharField', [], {'max_length': '10', 'blank': 'True'}),
+            'primary': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'db_index': 'True'}),
+            'state': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'})
+        },
+        'rsr.projectupdate': {
+            'Meta': {'ordering': "['-id']", 'object_name': 'ProjectUpdate'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'language': ('django.db.models.fields.CharField', [], {'default': "'en'", 'max_length': '2'}),
+            'photo': ('django.db.models.fields.files.ImageField', [], {'max_length': '100', 'blank': 'True'}),
+            'photo_caption': ('django.db.models.fields.CharField', [], {'max_length': '75', 'blank': 'True'}),
+            'photo_credit': ('django.db.models.fields.CharField', [], {'max_length': '25', 'blank': 'True'}),
+            'photo_location': ('django.db.models.fields.CharField', [], {'max_length': '1'}),
+            'project': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'project_updates'", 'to': "orm['rsr.Project']"}),
+            'text': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'time': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'db_index': 'True', 'blank': 'True'}),
+            'time_last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'db_index': 'True', 'blank': 'True'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '50', 'db_index': 'True'}),
+            'update_method': ('django.db.models.fields.CharField', [], {'default': "'W'", 'max_length': '1', 'db_index': 'True', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}),
+            'video': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}),
+            'video_caption': ('django.db.models.fields.CharField', [], {'max_length': '75', 'blank': 'True'}),
+            'video_credit': ('django.db.models.fields.CharField', [], {'max_length': '25', 'blank': 'True'})
+        },
+        'rsr.publishingstatus': {
+            'Meta': {'ordering': "('-status', 'project')", 'object_name': 'PublishingStatus'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'project': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['rsr.Project']", 'unique': 'True'}),
+            'status': ('django.db.models.fields.CharField', [], {'default': "'unpublished'", 'max_length': '30'})
+        },
+        'rsr.smsreporter': {
+            'Meta': {'unique_together': "(('userprofile', 'gw_number', 'project'),)", 'object_name': 'SmsReporter'},
+            'gw_number': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['gateway.GatewayNumber']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'project': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['rsr.Project']", 'null': 'True', 'blank': 'True'}),
+            'userprofile': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'reporters'", 'to': "orm['rsr.UserProfile']"})
+        },
+        'rsr.userprofile': {
+            'Meta': {'ordering': "['user__username']", 'object_name': 'UserProfile'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'organisation': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['rsr.Organisation']"}),
+            'phone_number': ('django.db.models.fields.CharField', [], {'max_length': '50', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'}),
+            'validation': ('django.db.models.fields.CharField', [], {'max_length': '20', 'blank': 'True'})
+        }
+    }
+
+    complete_apps = ['rsr']
+    symmetrical = True
diff --git a/akvo/rsr/models.py b/akvo/rsr/models.py
index 79d72de3bc..e8bf5294e9 100644
--- a/akvo/rsr/models.py
+++ b/akvo/rsr/models.py
@@ -188,6 +188,17 @@ class ProjectLocation(BaseLocation):
     location_target = models.ForeignKey('Project', null=True, related_name='locations')
 
 
+class PartnerType(models.Model):
+    id = models.CharField(max_length=8, primary_key=True, unique=True)
+    label = models.CharField(max_length=30, unique=True)
+
+    def __unicode__(self):
+        return self.label
+
+    class Meta:
+        ordering = ('label',)
+
+
 class Partnership(models.Model):
     FIELD_PARTNER = u'field'
     FUNDING_PARTNER = u'funding'
@@ -268,6 +279,7 @@ def image_path(instance, file_name):
         max_length=2, choices=settings.LANGUAGES, default='en',
         help_text=u'The main language of the organisation',
     )
+    partner_types = models.ManyToManyField(PartnerType)
     organisation_type = models.CharField(_(u'organisation type'), max_length=1, db_index=True, choices=ORG_TYPES)
     new_organisation_type = models.IntegerField(
         _(u'IATI organisation type'), db_index=True, choices=IATI_LIST_ORGANISATION_TYPE, default=22,
@@ -2062,6 +2074,7 @@ def custom_logo_path(instance, filename):
     organisation = models.ForeignKey(Organisation, verbose_name=_(u'organisation'),
         help_text=_('Select your organisation from the drop-down list.')
     )
+    notes = models.TextField(verbose_name=u'Akvo partner site notes', blank=True)
     hostname = models.CharField(_(u'hostname'), max_length=50, unique=True,
         help_text=_(
             u'<p>Your hostname is used in the default web address of your partner site. '
diff --git a/akvo/templates/admin/rsr/organisation/change_form.html b/akvo/templates/admin/rsr/organisation/change_form.html
index 2dbc0f2a63..6572df9d2c 100644
--- a/akvo/templates/admin/rsr/organisation/change_form.html
+++ b/akvo/templates/admin/rsr/organisation/change_form.html
@@ -43,12 +43,12 @@ <h2>{% trans 'Adding and Editing Organisations.' %}</h2>
         {% for fieldset in adminform %}
           {% include "admin/includes/fieldset.html" %}
           {# hack to put the inlines at certain points in the form #}
-          {% if forloop.counter == 2 %}
+          {% if forloop.counter == 2 and inline_admin_formsets.0 %}
             {% with inline_admin_formset=inline_admin_formsets.0 %}
               {% include inline_admin_formset.opts.template %}
             {% endwith %}
           {% endif %}
-          {% if forloop.counter == 3 %}
+          {% if forloop.counter == 3 and inline_admin_formsets.1 %}
             {% with inline_admin_formset=inline_admin_formsets.1 %}
               {% include inline_admin_formset.opts.template %}
             {% endwith %}