Allow specifying bodyParser on userProfileAction and withUserAction
WIP, not compiling
Compiling, still a long way from working
WIP on profile upload
Ignore aws conf
Functional, if inelegant, profile image setter/uploader
Clean up image resize and S3 upload
Start spec'ing upload functionality
Refactor profile-related actions into their own controller
Fix wrong generic type of index search action (and additonal tidy up)
Set correct auth config
Fix style
Only set image if it's hasn't been set already
More testing
Tweak css
Now two js files. See #151
Merge branch 'master' into s3_upload, which additional changes (whoops).

Conflicts:
	modules/portal/conf/messages
Put correct tooltips on watch/unwatch buttons
Put tooltips on watch/unwatch buttons in search list
Merge pull request #155 from PonteIneptique/javascript

Now two js files. See #151