Admin module update, App RC
Merge admin_update_2

Conflicts:
	.gitignore
Merging app and admin module